Move bootstrap to core. Removed tipsy (replaced by tooltip)

e107_admin/auth.php

@@ -271,7 +271,7 @@ else
 		
 		e107::css('inline',"
 		
-			body 				{ 	text-align: left; font-size:15px; line-height:1.5em; font-weight:normal; font-family:Arial, Helvetica, sans-serif; background:#081D28 url(".e_IMAGE."logo_template_large.png) no-repeat 50% 10px; }
+			body 				{ 	text-align: left; font-size:15px; line-height:1.5em; font-weight:normal; font-family:Arial, Helvetica, sans-serif; background:#081D28 url(".e_IMAGE."logo_template_large.png) no-repeat 50% 40px; }
 			a					{ 	color:#F6931E; text-decoration:none; }
 			a:hover				{ 	color:silver; text-decoration:none; }
 			.bold				{ 	font-weight:bold; }
@@ -297,12 +297,14 @@ else
 			.field input:hover	{
 									border:1px solid #F6931E;
 								}
-					
+			
 			#login-admin 		{
 									margin-left:auto;
 									margin-right:auto;
-									margin-top:200px;
+									margin-top:12%;
+										
 									width:400px; 
+									/*	
 									padding: 10px 20px 0 20px;
 									-moz-border-radius:5px;
 									-webkit-border-radius:5px;
@@ -311,6 +313,7 @@ else
 									-webkit-box-shadow:5px 5px 20px #000000;
 									box-shadow:5px 5px 20px #000000;	
 									background-color: #FEFEFE;
+									*/
 								}
 			
 			#login-admin label 	{ 	display: none; text-align: right	}
@@ -369,9 +372,9 @@ class auth
 		$class = (e_QUERY == 'failed') ? "class='e-shake'" : "";
 			
 		$text = "<form id='admin-login' method='post' action='".e_SELF."' {$incChap} >
-		<div id='login-admin' >
+		<div id='login-admin' class='well center'>
 		<div {$class}>
-		<h2>".e_DOMAIN." admin area</h2>
+		<h3>".e_DOMAIN." admin area</h3>
         
 		    <div class='field'>
 		    	<label for='username'>".ADLAN_89."</label> 

e107_admin/header.php

@@ -44,8 +44,8 @@ e107::js('core', 	'password/jquery.pwdMeter.js', 'jquery', 2);
 
 
 // e107::js("core",	"core/mediaManager.js","jquery",3);
-e107::js("core",	"tooltip/jquery.tipsy.js","jquery",3);
-e107::css('core', 	'tooltip/tipsy.css', 'jquery');
+//e107::js("core",	"tooltip/jquery.tipsy.js","jquery",3);
+//e107::css('core', 	'tooltip/tipsy.css', 'jquery');
 
 e107::js("core",	"tags/jquery.tagit.js","jquery",3);
 e107::css('core', 	'tags/jquery.tagit.css', 'jquery');

e107_themes/bootstrap/admin_style.css

@@ -8,21 +8,26 @@
 }
 
 .tipsy-inner 	{ padding:10px; font-size:15px; }
-      
+
+.tooltip 			{ font-size: 13px; }    
+.tooltip-inner 	{ box-shadow: 0 2px 5px #808080; -webkit-box-shadow: 0 2px 5px #808080; -moz-box-shadow: 0 2px 5px #808080; }  
+ 
+ 
+ 
 /* Core Formatting */
-.left			{ text-align: left }
-.right			{ text-align: right }
-.center			{ text-align: center }
-.f-left			{ float: left }
-.f-right		{ float: right }
-.top			{ vertical-align: top }
-.middle			{ vertical-align: middle }
-.bottom			{ vertical-align: bottom }
-.clear			{ clear: both }
-.clear-l		{ clear: right }
-.clear-r		{ clear: left }
-.smalltext		{ font-size: 11px; }
-.nowrap			{ white-space:nowrap; }
+.left				{ text-align: left }
+.right				{ text-align: right }
+.center				{ text-align: center }
+.f-left				{ float: left }
+.f-right			{ float: right }
+.top				{ vertical-align: top }
+.middle				{ vertical-align: middle }
+.bottom				{ vertical-align: bottom }
+.clear				{ clear: both }
+.clear-l			{ clear: right }
+.clear-r			{ clear: left }
+.smalltext			{ font-size: 11px; }
+.nowrap				{ white-space:nowrap; }
 
 
 .core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; }
@@ -33,7 +38,7 @@ td.center, th.center { text-align:center }
 .col-label 		{ width:30%; }
 
 .sidebar-nav 	{ padding: 9px 0; font-size:11px; min-width:150px; }
-
+/*
 a.brand:hover img {
 	filter: blur(13px); 
 	-webkit-filter: blur(13px); 
@@ -41,7 +46,7 @@ a.brand:hover img {
 	-o-filter: blur(13px); 
 	-ms-filter: blur(13px);
 }
-
+*/
 @media (min-width: 1300px) { 
 	
 .sidebar-nav 	{ font-size:12px; }

e107_themes/bootstrap/admin_template.php

@@ -135,7 +135,7 @@ $E_ADMIN_NAVIGATION['end'] = '</ul>';
 $ADMIN_HEADER = '<div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container-fluid">  
-          <a class="brand" href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel"><img class="admin-logo" src="'.THEME.'img/e107_adminlogo.png" alt="e107" /></a>
+          <a class="brand " href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel"><img class="admin-logo" src="'.THEME.'images/e107_adminlogo.png" alt="e107" /></a>
           <div class="nav-collapse collapse">
             <div class="dropdown nav pull-right navbar-text ">
             

e107_themes/bootstrap/admin_theme.php

@@ -5,9 +5,9 @@ define('STANDARDS_MODE', TRUE);
 define("VIEWPORT","width=device-width, initial-scale=1.0");
 
 e107::lan('theme');
-e107::js('theme','js/bootstrap.js');
-e107::css('theme','css/bootstrap.css');
-e107::css('theme','css/bootstrap-responsive.css');
+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('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");
 /*
 $drop = "

e107_web/js/core/admin.jquery.js

@@ -13,7 +13,7 @@ $(document).ready(function()
 				return;
 			}
 			
-			$(this).tipsy({opacity:1.0,fade:true});
+			$(this).tooltip({opacity:1.0,fade:true});
 			// $(this).css( 'cursor', 'pointer' )
 		});
 		
@@ -25,13 +25,13 @@ $(document).ready(function()
 			var t = $(this).nextAll(".field-help");
 			t.hide();
 		//	alert('hello');
-			$(this).tipsy({title: function() {
+			$(this).tooltip({title: function() {
 				var tip = t.text();			
 				 return tip; 
 				},
 				fade: true,
 				html: true,
-				gravity: 'w'  
+				placement: 'right'  
 			});
 		
 		});

e107_web/js/core/all.jquery.js

@@ -193,7 +193,7 @@ $(document).ready(function()
 
 		
 		// 	Tooltips for bbarea. 
-		$(".bbcode_buttons").tipsy({gravity: 's',opacity: 1.0, fade: true,html: true});
+		$(".bbcode_buttons").tooltip({placement: 'top',opacity: 1.0, fade: true,html: true});
 	//	$("a.e-tip").tipsy({gravity: 'w',opacity: 1.0, fade: true,html: true});
 	//	var tabs = $('#tab-container').clone(true);
 	//	$('#htmlEditor').append(tabs);

e107_web/js/tooltip/jquery.tipsy.js

@@ -1,241 +0,0 @@
-// tipsy, facebook style tooltips for jquery
-// version 1.0.0a
-// (c) 2008-2010 jason frame [jason@onehackoranother.com]
-// released under the MIT license
-
-(function($) {
-    
-    function maybeCall(thing, ctx) {
-        return (typeof thing == 'function') ? (thing.call(ctx)) : thing;
-    };
-    
-    function Tipsy(element, options) {
-        this.$element = $(element);
-        this.options = options;
-        this.enabled = true;
-        this.fixTitle();
-    };
-    
-    Tipsy.prototype = {
-        show: function() {
-            var title = this.getTitle();
-            if (title && this.enabled) {
-                var $tip = this.tip();
-                
-                $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title);
-                $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity
-                $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body);
-                
-                var pos = $.extend({}, this.$element.offset(), {
-                    width: this.$element[0].offsetWidth,
-                    height: this.$element[0].offsetHeight
-                });
-                
-                var actualWidth = $tip[0].offsetWidth,
-                    actualHeight = $tip[0].offsetHeight,
-                    gravity = maybeCall(this.options.gravity, this.$element[0]);
-                
-                var tp;
-                switch (gravity.charAt(0)) {
-                    case 'n':
-                        tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
-                        break;
-                    case 's':
-                        tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
-                        break;
-                    case 'e':
-                        tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset};
-                        break;
-                    case 'w':
-                        tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset};
-                        break;
-                }
-                
-                if (gravity.length == 2) {
-                    if (gravity.charAt(1) == 'w') {
-                        tp.left = pos.left + pos.width / 2 - 15;
-                    } else {
-                        tp.left = pos.left + pos.width / 2 - actualWidth + 15;
-                    }
-                }
-                
-                $tip.css(tp).addClass('tipsy-' + gravity);
-                $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0);
-                if (this.options.className) {
-                    $tip.addClass(maybeCall(this.options.className, this.$element[0]));
-                }
-                
-                if (this.options.fade) {
-                    $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity});
-                } else {
-                    $tip.css({visibility: 'visible', opacity: this.options.opacity});
-                }
-            }
-        },
-        
-        hide: function() {
-            if (this.options.fade) {
-                this.tip().stop().fadeOut(function() { $(this).remove(); });
-            } else {
-                this.tip().remove();
-            }
-        },
-        
-        fixTitle: function() {
-            var $e = this.$element;
-            if ($e.attr('title') || typeof($e.attr('original-title')) != 'string') {
-                $e.attr('original-title', $e.attr('title') || '').removeAttr('title');
-            }
-        },
-        
-        getTitle: function() {
-            var title, $e = this.$element, o = this.options;
-            this.fixTitle();
-            var title, o = this.options;
-            if (typeof o.title == 'string') {
-                title = $e.attr(o.title == 'title' ? 'original-title' : o.title);
-            } else if (typeof o.title == 'function') {
-                title = o.title.call($e[0]);
-            }
-            title = ('' + title).replace(/(^\s*|\s*$)/, "");
-            return title || o.fallback;
-        },
-        
-        tip: function() {
-            if (!this.$tip) {
-                this.$tip = $('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"></div>');
-            }
-            return this.$tip;
-        },
-        
-        validate: function() {
-            if (!this.$element[0].parentNode) {
-                this.hide();
-                this.$element = null;
-                this.options = null;
-            }
-        },
-        
-        enable: function() { this.enabled = true; },
-        disable: function() { this.enabled = false; },
-        toggleEnabled: function() { this.enabled = !this.enabled; }
-    };
-    
-    $.fn.tipsy = function(options) {
-        
-        if (options === true) {
-            return this.data('tipsy');
-        } else if (typeof options == 'string') {
-            var tipsy = this.data('tipsy');
-            if (tipsy) tipsy[options]();
-            return this;
-        }
-        
-        options = $.extend({}, $.fn.tipsy.defaults, options);
-        
-        function get(ele) {
-            var tipsy = $.data(ele, 'tipsy');
-            if (!tipsy) {
-                tipsy = new Tipsy(ele, $.fn.tipsy.elementOptions(ele, options));
-                $.data(ele, 'tipsy', tipsy);
-            }
-            return tipsy;
-        }
-        
-        function enter() {
-            var tipsy = get(this);
-            tipsy.hoverState = 'in';
-            if (options.delayIn == 0) {
-                tipsy.show();
-            } else {
-                tipsy.fixTitle();
-                setTimeout(function() { if (tipsy.hoverState == 'in') tipsy.show(); }, options.delayIn);
-            }
-        };
-        
-        function leave() {
-            var tipsy = get(this);
-            tipsy.hoverState = 'out';
-            if (options.delayOut == 0) {
-                tipsy.hide();
-            } else {
-                setTimeout(function() { if (tipsy.hoverState == 'out') tipsy.hide(); }, options.delayOut);
-            }
-        };
-        
-        if (!options.live) this.each(function() { get(this); });
-        
-        if (options.trigger != 'manual') {
-            var binder   = options.live ? 'live' : 'bind',
-                eventIn  = options.trigger == 'hover' ? 'mouseenter' : 'focus',
-                eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
-            this[binder](eventIn, enter)[binder](eventOut, leave);
-        }
-        
-        return this;
-        
-    };
-    
-    $.fn.tipsy.defaults = {
-        className: null,
-        delayIn: 0,
-        delayOut: 0,
-        fade: false,
-        fallback: '',
-        gravity: 'n',
-        html: false,
-        live: false,
-        offset: 0,
-        opacity: 0.8,
-        title: 'title',
-        trigger: 'hover'
-    };
-    
-    // Overwrite this method to provide options on a per-element basis.
-    // For example, you could store the gravity in a 'tipsy-gravity' attribute:
-    // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' });
-    // (remember - do not modify 'options' in place!)
-    $.fn.tipsy.elementOptions = function(ele, options) {
-        return $.metadata ? $.extend({}, options, $(ele).metadata()) : options;
-    };
-    
-    $.fn.tipsy.autoNS = function() {
-        return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n';
-    };
-    
-    $.fn.tipsy.autoWE = function() {
-        return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w';
-    };
-    
-    /**
-     * yields a closure of the supplied parameters, producing a function that takes
-     * no arguments and is suitable for use as an autogravity function like so:
-     *
-     * @param margin (int) - distance from the viewable region edge that an
-     *        element should be before setting its tooltip's gravity to be away
-     *        from that edge.
-     * @param prefer (string, e.g. 'n', 'sw', 'w') - the direction to prefer
-     *        if there are no viewable region edges effecting the tooltip's
-     *        gravity. It will try to vary from this minimally, for example,
-     *        if 'sw' is preferred and an element is near the right viewable 
-     *        region edge, but not the top edge, it will set the gravity for
-     *        that element's tooltip to be 'se', preserving the southern
-     *        component.
-     */
-     $.fn.tipsy.autoBounds = function(margin, prefer) {
-		return function() {
-			var dir = {ns: prefer[0], ew: (prefer.length > 1 ? prefer[1] : false)},
-			    boundTop = $(document).scrollTop() + margin,
-			    boundLeft = $(document).scrollLeft() + margin,
-			    $this = $(this);
-
-			if ($this.offset().top < boundTop) dir.ns = 'n';
-			if ($this.offset().left < boundLeft) dir.ew = 'w';
-			if ($(window).width() + $(document).scrollLeft() - $this.offset().left < margin) dir.ew = 'e';
-			if ($(window).height() + $(document).scrollTop() - $this.offset().top < margin) dir.ns = 's';
-
-			return dir.ns + (dir.ew ? dir.ew : '');
-		}
-	};
-    
-})(jQuery);

e107_web/js/tooltip/tipsy.css

@@ -1,25 +0,0 @@
-.tipsy 					{ font-size: 10px; position: absolute; padding: 5px; z-index: 100000; }
-.tipsy-inner 			{ background-color: #000; color: #FFF; max-width: 200px; word-wrap:break-word; padding: 5px 8px 4px 8px; text-align: center; }
-
-  /* Rounded corners */
-.tipsy-inner 			{ border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
-  
-  /* Uncomment for shadow */
-.tipsy-inner 			{ box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }
-  
-.tipsy-arrow 			{ position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; }
-  
-  /* Rules to colour arrows */
-.tipsy-arrow-n 			{ border-bottom-color: #000; }
-.tipsy-arrow-s 			{ border-top-color: #000; }
-.tipsy-arrow-e 			{ border-left-color: #000; }
-.tipsy-arrow-w 			{ border-right-color: #000; }
-
-.tipsy-n .tipsy-arrow 	{ top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; }
-.tipsy-nw .tipsy-arrow 	{ top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
-.tipsy-ne .tipsy-arrow 	{ top: 0; right: 10px; border-bottom-style: solid; border-top: none;  border-left-color: transparent; border-right-color: transparent;}
-.tipsy-s .tipsy-arrow 	{ bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none;  border-left-color: transparent; border-right-color: transparent; }
-.tipsy-sw .tipsy-arrow 	{ bottom: 0; left: 10px; border-top-style: solid; border-bottom: none;  border-left-color: transparent; border-right-color: transparent; }
-.tipsy-se .tipsy-arrow 	{ bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
-.tipsy-e .tipsy-arrow 	{ right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; }
-.tipsy-w .tipsy-arrow 	{ left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; }