mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Tooltips working again on frontend

Browse Source
This commit is contained in:
Cameron 2012-11-28 18:56:52 -08:00
parent 54ac401647
commit 0b03f8ed5a
6 changed files with 105 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@ -118,7 +118,10 @@ class signup_shortcodes extends e_shortcode
function sc_signup_signup_text()
{
global $pref, $tp, $SIGNUP_TEXT;
global $SIGNUP_TEXT;
$pref = e107::getPref();
$tp = e107::getParser();
if($pref['signup_text'])
{
@ -126,7 +129,7 @@ class signup_shortcodes extends e_shortcode
}
elseif($pref['user_reg_veri'])
{
return $SIGNUP_TEXT;
return $SIGNUP_TEXT." ";
}
}

11
e107_themes/bootstrap/theme.php
View File

@ -1,10 +1,13 @@
<?php
if ( ! defined('e107_INIT')) { exit(); }
include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
// TODO theme.xml - add them to jslib/php source
e107::getJs()->requireCoreLib('core/decorate.js')
->requireCoreLib('core/tabs.js');
define("VIEWPORT","width=device-width, initial-scale=1.0");
e107::lan('theme');
e107::js('core','bootstrap/js/bootstrap.min.js');
e107::css('core','bootstrap/css/bootstrap.min.css');
e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
e107::css('core','bootstrap/css/jquery-ui.custom.css');
//$register_sc[]='FS_ADMIN_ALT_NAV';
$no_core_css = TRUE;

10
e107_themes/templates/header_default.php
View File

@ -23,13 +23,19 @@ define('ADMIN_AREA',FALSE);
$e107 = e107::getInstance();
$e107->sql->db_Mark_Time('(Header Top)');
e107::js('core', 'colorbox/jquery.colorbox-min.js', 'jquery', 2);
e107::css('core', 'colorbox/colorbox.css', 'jquery');
// Used for Signup form elements - could be on any page of the site.
e107::js('core', 'jquery.mailcheck.min.js','jquery',2);
e107::js("core", "tooltip/jquery.tipsy.js","jquery",3);
e107::css('core', 'tooltip/tipsy.css', 'jquery');
e107::js('core','bootstrap/js/bootstrap-tooltip.js','jquery');
e107::css('core','bootstrap/css/tooltip.css','jquery');
//e107::js("core", "tooltip/jquery.tipsy.js","jquery",3);
// e107::css('core', 'tooltip/tipsy.css', 'jquery');
// ------------------
e107::js('core', 'jquery.elastic.js', 'jquery', 2);

9
e107_themes/templates/signup_template.php
View File

@ -187,11 +187,10 @@ if(!defined($COPPA_FAIL))
if(!defined($SIGNUP_TEXT))
{
$SIGNUP_TEXT =
"{SIGNUP_SIGNUP_TEXT}<br />".
LAN_SIGNUP_80." <b>".LAN_SIGNUP_29."</b><br /><br />".
LAN_SIGNUP_30."<br />".
LAN_SIGNUP_85;
$SIGNUP_TEXT = $tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // .
//LAN_SIGNUP_80." <b>".LAN_SIGNUP_29."</b><br /><br />".
//LAN_SIGNUP_30."<br />".
//LAN_SIGNUP_85;
}
if(!defined($SIGNUP_BEGIN))

72
e107_web/js/bootstrap/css/tooltip.css Normal file
View File

@ -0,0 +1,72 @@
.tooltip {
position: absolute;
z-index: 1030;
display: block;
visibility: visible;
padding: 5px;
font-size: 11px;
opacity: 0;
filter: alpha(opacity=0);
}
.tooltip.in {
opacity: 0.8;
filter: alpha(opacity=80);
}
.tooltip.top {
margin-top: -3px;
}
.tooltip.right {
margin-left: 3px;
}
.tooltip.bottom {
margin-top: 3px;
}
.tooltip.left {
margin-left: -3px;
}
.tooltip-inner {
max-width: 200px;
padding: 3px 8px;
color: #ffffff;
text-align: center;
text-decoration: none;
background-color: #000000;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.tooltip-arrow {
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
.tooltip.top .tooltip-arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
border-width: 5px 5px 0;
border-top-color: #000000;
}
.tooltip.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-width: 5px 5px 5px 0;
border-right-color: #000000;
}
.tooltip.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-width: 5px 0 5px 5px;
border-left-color: #000000;
}
.tooltip.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-width: 0 5px 5px;
border-bottom-color: #000000;
}

18
e107_web/js/core/front.jquery.js
View File

@ -2,31 +2,31 @@
$(document).ready(function()
{
// $(":input").tipsy({gravity: 'w',fade: true, live: true});
$(":input").tooltip();
/*
$(":input,label,.e-tip").each(function() {
var field = $(this).nextAll(".field-help");
if(field.length == 0)
{
$(this).tipsy({gravity: 'sw',fade: true, live: true}); // Normal 'title' attribute
$(this).tooltip({placement: 'right',fade: true}); // Normal 'title' attribute
return;
}
field.hide();
$(this).tipsy({
$(this).tooltip({
title: function() {
return field.html(); // field-help when HTML is required.
},
fade: true,
live: true,
html: true,
gravity: 'sw'
placement: 'right'
});
});
*/
// var color = $(".divider").parents().css("background-color");
@ -50,7 +50,7 @@ $(document).ready(function()
data: data,
success: function(data) {
// alert(data);
// alert(data);
// console.log(data);
var a = $.parseJSON(data);
@ -62,11 +62,11 @@ $(document).ready(function()
}
else if(sort == 'desc')
{
$(a.html).prependTo('#comments-container').hide().slideDown(800);
$(a.html).prependTo('#comments-container').hide().slideDown(800); // FIXME - works in jquery 1.7, not 1.8
}
else
{
$(a.html).appendTo('#comments-container').hide().slideDown(800);
$(a.html).appendTo('#comments-container').hide().slideDown(800); // FIXME - works in jquery 1.7, not 1.8
alert('Thank you for commenting'); // possibly needed as the submission may go unoticed by the user
}