Issue #142 fixes - requires testing.

e107_admin/header.php

@@ -174,7 +174,8 @@ else // XHTML
 	echo(defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";
 	echo "<meta http-equiv='content-type' content='text/html; charset=utf-8' />\n";
 }
-echo (defined("VIEWPORT")) ? "<meta name=\"viewport\" content=\"".VIEWPORT."\" />\n" : "";
+echo "<meta name=\"viewport\" content=\"width=device-width; initial-scale=1; maximum-scale=1\" />\n"; // Works better for iOS but still has some issues. 
+// echo (defined("VIEWPORT")) ? "<meta name=\"viewport\" content=\"".VIEWPORT."\" />\n" : "";
 
 echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_head_4." :: ".SITENAME."</title>\n";
 

e107_admin/prefs.php

@@ -306,7 +306,7 @@ $text = "
 						<td>".PRFLAN_3."</td>
 						<td>
 							".$frm->text('siteurl', $pref['siteurl'], 150)."
-							".($pref['siteurl'] == SITEURL ? "" : "<div class='smalltext'>( ".PRFLAN_159.": <strong>".SITEURL."</strong> )</div>")."
+							".($pref['siteurl'] == SITEURL ? "" : "<div class='field-help'>".PRFLAN_159.": <strong>".SITEURL."</strong></div>")."
 						</td>
 					</tr>
 					<tr>

e107_themes/bootstrap/admin_dark.css

@@ -25,6 +25,9 @@ min-height:50px;
     background-color: #191919;
 }
 
+.nav-collapse .nav > li > a:hover, .nav-collapse .nav > li > a:focus, .nav-collapse .dropdown-menu a:hover, .nav-collapse .dropdown-menu a:focus {
+    background-color: rgb(54, 54, 54);
+}
 
 
 

e107_themes/bootstrap/admin_style.css

@@ -1,5 +1,14 @@
 
-body 						{ padding-top: 75px; }
+body 						{ }
+
+@media (min-width: 1000px){ 
+	
+body						{ padding-top: 75px;  }
+
+
+} 
+
+
       	
 .well 						{ padding:10px; }
 .navbar 					{  }
@@ -83,6 +92,7 @@ a.brand:hover img 			{
 
 } 
 
+
 .modal 										{ min-width:800px; width:70%; left:15%;  right:15%; z-index:10001; margin-left:auto; margin-right:auto;}
 .modal-header								{ border-radius: 6px 6px 6px 6px; padding-left:20px; }
 .modal-body									{ max-height:80%; padding:10px }
@@ -597,11 +607,12 @@ ul.col-selection > li a 					{ padding: 3px 0px 0px 25px; color: rgb(153, 153, 1
 ul.col-selection > li a label 				{ padding-left:0px; display:block; line-height:25px; }
 
 
-.nav ul li ul.dropdown-menu 				{ margin-top:-5px; border-left:1px solid rgb(51, 51, 51); background-color: rgb(39, 39, 39); }
+.nav ul li ul.dropdown-menu 				{ border-left:1px solid rgb(51, 51, 51); background-color: rgb(39, 39, 39); }
 .nav ul li ul.dropdown-menu > li a 			{ border-top: 1px solid rgb(51, 51, 51); border-bottom: 1px solid rgb(32, 32, 32); }
 .nav ul li ul.dropdown-menu > li a 			{ padding-top:5px; padding-bottom:5px; color: rgb(200,200,200); }
 .nav ul li ul.dropdown-menu > li a:hover 	{ color: rgb(255, 255, 255); }
 
+.navbar .btn-navbar{ margin-top:12px }
 
 /* FIXME drop-down caret needs to be remove */
 

e107_themes/bootstrap/admin_template.php

@@ -160,47 +160,26 @@ $inverse = (e107::getPref('admincss') == "admin_light.css") ? "navbar-inverse" :
     
 $ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container-fluid">  
+        <div class="container-fluid"> 
+        <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </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 ">
+            
+            
+			<div class="dropdown nav">
+			{ADMIN_NAVIGATION=no-main}        	 
+   			 </div>
+   			 <div class="dropdown nav pull-right navbar-text ">
             {ADMIN_PM}
             {ADMIN_NAVIGATION=home}
 			{ADMIN_NAVIGATION=language}
 			{ADMIN_NAVIGATION=logout}
 		
             </div>
-            
-			<div class="dropdown nav">
-			{ADMIN_NAVIGATION=no-main}
-			
-			<!--
-				<ul class="nav" role="navigation">
-                    <li class="dropdown">
-                      <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                      <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
-                        <li><a href="http://google.com">Action</a></li>
-                        <li><a href="#anotherAction">Another action</a></li>
-                        <li><a href="#">Something else here</a></li>
-                        <li class="divider"></li>
-                        <li><a href="#">Separated link</a></li>
-                      </ul>
-                    </li>
-                    <li class="dropdown">
-                      <a href="#" id="drop2" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2 <b class="caret"></b></a>
-                      <ul class="dropdown-menu" role="menu" aria-labelledby="drop2">
-                        <li><a tabindex="-1" href="#">Action</a></li>
-                        <li><a tabindex="-1" href="#">Another action</a></li>
-                        <li><a tabindex="-1" href="#">Something else here</a></li>
-                        <li class="divider"></li>
-                        <li><a tabindex="-1" href="#">Separated link</a></li>
-                      </ul>
-                    </li>
-                  </ul>
-             -->    
-          
-        	 
-   			 </div>
           </div><!--/.nav-collapse -->
         </div>
       </div>