Changeset 25791 for extensions/AdminTools/template

Timestamp:

Dec 5, 2013, 8:36:36 PM (10 years ago)

Author:

mistic100

Message:

fix security problem, fix sql fatal error, try to fix display on smartpocket

Location:

extensions/AdminTools/template

Files:

• public_controller.tpl (modified) (5 diffs)
• style.css (modified) (6 diffs)

extensions/AdminTools/template/public_controller.tpl

@@ -102 +102 @@
     <form method="post" action="{$ato.U_SELF}">
       <fieldset class="left">
-        <img src="{$ato.QUICK_EDIT.img->get_url()}" width="100" height="100">
+        <img src="{$ato.QUICK_EDIT.img}" width="100" height="100">
         <input type="submit" value="{'Save'|translate}">
         <a href="#" class="icon-ato-cancel close-edit">{'Cancel'|translate}</a>
@@ -150 +150 @@
       $('body').animate({ldelim}'margin-top': operator+ato_height});
       
-      if ($('#the_page').css('position')=='absolute') {
-        $('#the_page').animate({ldelim}'top': operator+ato_height});
+      if ($('#the_page, [data-role="page"]').css('position')=='absolute') {
+        $('#the_page, [data-role="page"]').animate({ldelim}'top': operator+ato_height});
       }
     }
@@ -157 +157 @@
       $('body').css({ldelim}'margin-top': operator+ato_height});
       
-      if ($('#the_page').css('position')=='absolute') {
-        $('#the_page').css({ldelim}'top': operator+ato_height});
+      if ($('#the_page, [data-role="page"]').css('position')=='absolute') {
+        $('#the_page, [data-role="page"]').css({ldelim}'top': operator+ato_height});
       }
     }
@@ -168 +168 @@
       urlWS = '{$ROOT_URL}ws.php?format=json&method=';
 
-  $('body').prepend($ato);
+  $('body').prepend($ato); // ensure the bar is at the begining
+  
+  {if $themeconf.mobile}
+    var $headerbar = $('div[data-role="header"] .title');
+    if ($headerbar.length == 1) {
+      $ato_closed.addClass('smartpocket');
+      $ato_closed.find('a').attr({
+        'data-iconpos':'notext',
+        'data-role':'button'
+      });
+      $headerbar.prepend($ato_closed);    
+    }
+  {/if}
 
   if (window.localStorage.ato_panel_open == null) {
@@ -289 +301 @@
 {if isset($ato.QUICK_EDIT)}
   var $ato_edit = $('#ato_quick_edit');
-
-  var bg_color = $('#the_page #content').css('background-color');
-  if (!bg_color || bg_color=='transparent') {
-    bg_color = $('body').css('background-color');
-  }
-  $ato_edit.css('background-color', bg_color);
+  
+  
+  setTimeout(function() {
+    var bg_color = 'white';
+    var selectors = ['#the_page #content', '[data-role="page"]', 'body'];
+    
+    for (var i=0; i<selectors.length; i++) {
+      var color = $(selectors[i]).css('background-color');
+      console.log(selectors[i], color);
+      if (color && color!='transparent') {
+        bg_color = color;
+        break;
+      }
+    }
+
+    $ato_edit.css('background-color', bg_color);
+  }, 1000);
 
   $ato_edit.find('.close-edit').on('click', function(e) {

extensions/AdminTools/template/style.css

@@ -7 +7 @@
 #ato_header, #ato_header_closed {
   display:none;
+}
+#ato_header, #ato_header_closed:not(.smartpocket) {
   position:fixed;
   top:0;
@@ -28 +30 @@
   white-space:nowrap;
 }
-  #ato_header_root li a, #ato_header_closed a {
+  #ato_header_root li a, #ato_header_closed:not(.smartpocket) a {
     display:inline-block;
     padding:5px 10px;
@@ -54 +56 @@
     border-right:1px solid #222;
   }
-  #ato_header_root>li a, #ato_header_closed a {
+  #ato_header_root>li a, #ato_header_closed:not(.smartpocket) a {
     color:#ddd;
     text-shadow:1px 1px 0px #222;
@@ -62 +64 @@
     text-shadow:none;
   }
-  #ato_header_root>li:not(.disabled):hover, #ato_header_closed:hover {
+  #ato_header_root>li:not(.disabled):hover, #ato_header_closed:not(.smartpocket):hover {
     background:#222;
     background-image:linear-gradient(to bottom, #222, #353535);
@@ -113 +115 @@
     }
 
-#ato_header_closed {
+#ato_header_closed:not(.smartpocket) {
   left:10px;
   font-size:20px;
@@ -121 +123 @@
   height:35px;
 }
-  #ato_header_closed a {
+  #ato_header_closed:not(.smartpocket) a {
     padding:4px;
   }
+#ato_header_closed.smartpocket {
+  float:left;
+  margin-right:10px;
+}
+  #ato_header_closed.smartpocket .ui-btn-inner {
+    display:none;
+  }
+
 #ato_header_root a.close-panel {
   padding:6px 1px 4px 5px;