[ros-diffs] [dgoette] 402: * styling fixes * hide statistics tab * another fix for compare function spotted by Colin Finck

Author: dgoette
Date: Tue May  5 00:21:49 2009
New Revision: 402

URL: http://svn.reactos.org/svn/reactos?rev=402&view=rev
Log:
* styling fixes
* hide statistics tab
* another fix for compare function
spotted by Colin Finck

Modified:
    branches/danny-web/www/www.reactos.org/roscms/css/cms_maintain.css
    branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css
    branches/danny-web/www/www.reactos.org/roscms/js/cms.js
    branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js
    branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js
    branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php
    branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas…
   
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_UserDetai…
   
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
   
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserD…
    branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Maintain.cl…
    branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla…

Modified: branches/danny-web/www/www.reactos.org/roscms/css/cms_maintain.css
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/css/cms_maintain.css [iso-8859-1]
(original)
+++ branches/danny-web/www/www.reactos.org/roscms/css/cms_maintain.css [iso-8859-1] Tue
May  5 00:21:49 2009
@@ -26,4 +26,15 @@
 #maintainarea { margin-top: 1.5em; border: 1px dashed lightgrey; min-height: 200px;
background-color: white; }
 #usertable { min-height: 200px; background-color: white; }
 
-#lmAccess { margin-top: 1.5em; }
+#lmAccess { margin-top: 1.5em; }
+
+LABEL {
+  display: block;
+  font-weight:bold;
+  color: #369;
+}
+LABEL.normal {
+  display: inline;
+  font-weight: normal;
+  color: black;
+}

Modified: branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css [iso-8859-1]
(original)
+++ branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css [iso-8859-1] Tue May
 5 00:21:49 2009
@@ -90,3 +90,4 @@
 
 .deletebutton { cursor:pointer; color:#006090; font-weight: bold; }
 
+#previewzone {background-color: white;min-height: 300px;padding-top: 10px;}

Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/js/cms.js [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/js/cms.js [iso-8859-1] Tue May  5
00:21:49 2009
@@ -51,9 +51,11 @@
 {
   if (id.value == search_phrase) {
     id.value = '';
+    id.style.color='black';
   }
   else if (id.value === '') {
     id.value = search_phrase;
+    id.style.color='gray';
   }
 } // end of function clearSearchBox
 

Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js [iso-8859-1]
(original)
+++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js [iso-8859-1] Tue
May  5 00:21:49 2009
@@ -68,7 +68,7 @@
   theme_advanced_toolbar_location : "top",
   theme_advanced_toolbar_align : "left",
   theme_advanced_statusbar_location : "bottom",
-  theme_advanced_resizing : false,
+  theme_advanced_resizing : true,
 
   plugi2n_insertdate_dateFormat : "%Y-%m-%d",
   plugi2n_insertdate_timeFormat : "%H:%M:%S",

Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1]
(original)
+++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Tue May 
5 00:21:49 2009
@@ -644,14 +644,17 @@
     document.getElementById('previewarea').style.display = 'none';
     document.getElementById('newentryarea').style.display = 'none';
     document.getElementById('frameedit').style.display = 'block';
+    
   }
   
-  if (event == 'diff') {
-    document.getElementById('editzone').style.display = 'none';
-  }
-  else {
-    document.getElementById('editzone').style.display = 'block';
-  }
+    if (event == 'diff') {
+      document.getElementById('editzone').style.display = 'none';
+      document.getElementById('frmdiff').style.display = 'block';
+    }
+    else {
+      document.getElementById('editzone').style.display = 'block';
+      document.getElementById('frmdiff').style.display = 'none';
+    }
 
   // deactivate alert-timer
   window.clearTimeout(alertactiv);

Modified: branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php [iso-8859-1]
(original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php [iso-8859-1] Tue
May  5 00:21:49 2009
@@ -138,7 +138,7 @@
     // Statistics branch tab
     if ($thisuser->hasAccess('stats')) {
       echo_strip('
-        <th'.(($this->branch == 'stats') ? '
class="active"' : '').'>
+        <th'.(($this->branch == 'stats') ? '
class="active"' : '').' style="display:none">
           <div class="corner_TL">
             <div class="corner_TR">
               <a class="text"
href="'.RosCMS::getInstance()->pathInstance().'?page=data&amp;branch=stats"
onclick="'."loadBranch()".'">Statistics</a>

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas…
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas…
[iso-8859-1] Tue May  5 00:21:49 2009
@@ -75,16 +75,19 @@
 
     // list rights in header
     foreach ($rights as $right) {
-      echo '<th style="vertical-align:bottom;"
title="'.$right['name'].':
'.$right['description'].'"><img
src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&amp;type=vtext&amp;text='.$right['name'].'"
alt="'.$right['name'].'" /></th>';
+      echo '<th style="vertical-align:bottom;"
title="'.$right['name'].':
'.$right['description'].'"><img
src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&amp;type=vtext&amp;text='.$right['name'].'&bgcolor=5984C3&textc=ffffff"
alt="'.$right['name'].'" /></th>';
     }
     echo '</tr></thead><tbody>';
 
     // get list of Groups
     $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, description
FROM ".ROSCMST_ACCESS." ORDER BY name ASC");
     $stmt->execute();
+    $x=0;
     while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) {
+    ++$x;
+    
       echo_strip('
-        <tr
title="'.htmlspecialchars($access['description']).'">
+        <tr id="tr'.$x.'" class="'.($x%2 ? 'even' :
'odd').'"
onmouseover="'."hlRow('tr".$x."',1)".'"
onmouseout="'."hlRow('tr".$x."',2)".'"
title="'.htmlspecialchars($access['description']).'">
          
<td>'.htmlspecialchars($access['name']).'</td>');
 
       // list rights per group
@@ -117,8 +120,8 @@
     while ($area = $stmt->fetch(PDO::FETCH_ASSOC)) {
       ++$x;
       echo_strip('
-        <tr id="trg'.$x.'" class="'.($x%2 ? 'even'
: 'odd').'"
onmouseover="'."hlRow('tr".$x."',1)".'"
onmouseout="'."hlRow('tr".$x."',2)".'">
-          <td title="'.$area['description'].'"><label
for="area'.$area['id'].'">'.$area['name'].'</label></td>
+        <tr id="trg'.$x.'" class="'.($x%2 ? 'even'
: 'odd').'"
onmouseover="'."hlRow('trg".$x."',1)".'"
onmouseout="'."hlRow('trg".$x."',2)".'">
+          <td title="'.$area['description'].'"><label
class="normal"
for="area'.$area['id'].'">'.$area['name'].'</label></td>
           <td><input type="checkbox" value="1"
name="area'.$area['id'].'"
id="area'.$area['id'].'" /></td>
         </tr>');
     }
@@ -219,7 +222,7 @@
     while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) {
       ++$x;
       echo_strip ('
-        <tr id="tr'.($x).'" class="'.($x%2 ? 'odd'
: 'even').'"
onclick="'."editGroup(".$group['id'].")".'"
onmouseover="'."hlRow(this.id,1)".'"
onmouseout="'."hlRow(this.id,2)".'">
+        <tr id="trg'.($x).'" class="'.($x%2 ? 'odd'
: 'even').'"
onclick="'."editGroup(".$group['id'].")".'"
onmouseover="'."hlRow(this.id,1)".'"
onmouseout="'."hlRow(this.id,2)".'">
           <td>'.$group['security_level'].'</td>
           <td>'.$group['name'].'</td>
           <td>'.htmlentities($group['description']).'</td>
@@ -303,13 +306,16 @@
         <br />
         <fieldset>
           <legend>configure group access rights</legend>
-          <table>
-            <tr>
-              <th>ACL Name</th>');
+          <table class="roscmsTable">
+            <thead>
+              <tr>
+                <th>ACL Name</th>');
     foreach ($rights as $right) {
-      echo '<th style="vertical-align:bottom;"
title="'.$right['name'].':
'.$right['description'].'"><img
src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&amp;type=vtext&amp;text='.$right['name'].'"
alt="'.$right['name'].'" /></th>';
-    }
-    echo '</tr>';
+      echo '<th style="vertical-align:bottom;"
title="'.$right['name'].':
'.$right['description'].'"><img
src="'.RosCMS::getInstance()->pathInstance().'?page=presentation&amp;type=vtext&amp;text='.$right['name'].'&bgcolor=5984C3&textc=ffffff"
alt="'.$right['name'].'" /></th>';
+    }
+    echo '
+        </tr>
+      </thead>';
 
     // for usage in loop
     $stmt_is=&DBConnection::getInstance()->prepare("SELECT TRUE FROM
".ROSCMST_ACL." WHERE group_id=:group_id AND right_id=:right_id AND
access_id=:access_id LIMIT 1");
@@ -318,10 +324,13 @@
     // show current ACL settings
     $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, description
FROM ".ROSCMST_ACCESS." ORDER BY name ASC");
     $stmt->execute();
+    $x=0;
     while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) {
+      ++$x;
+
       $stmt_is->bindParam('access_id',$access['id'],PDO::PARAM_INT);
       echo_strip('
-        <tr
title="'.htmlspecialchars($access['description']).'">
+        <tr id="tr'.$x.'" class="'.($x%2 ? 'even' :
'odd').'"
onmouseover="'."hlRow('tr".$x."',1)".'"
onmouseout="'."hlRow('tr".$x."',2)".'"
title="'.htmlspecialchars($access['description']).'">
          
<td>'.htmlspecialchars($access['name']).'</td>');
 
       // show right per group
@@ -341,10 +350,13 @@
         <br />
         <fieldset>
           <legend>Area Protection List (APL)</legend>
-          <table>
-            <tr>
-              <th>APL Name</th>
-              <th>Status</th>');
+          <table class="roscmsTable">
+            <thead>
+              <tr>
+                <th>APL Name</th>
+                <th>Status</th>
+              </tr>
+            </thead>');
               
     // for usage in loop
       $stmt_is=&DBConnection::getInstance()->prepare("SELECT TRUE FROM
".ROSCMST_AREA_ACCESS." WHERE group_id=:group_id AND area_id=:area_id LIMIT
1");
@@ -353,14 +365,17 @@
     // show current APL settings
     $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, description
FROM ".ROSCMST_AREA." ORDER BY name ASC");
     $stmt->execute();
+    $x=0;
     while ($area = $stmt->fetch(PDO::FETCH_ASSOC)) {
+      ++$x;
+    
       $stmt_is->bindParam('area_id',$area['id'],PDO::PARAM_INT);
       $stmt_is->execute();
       $is = $stmt_is->fetchColumn();
 
       echo_strip('
-        <tr>
-          <td title="'.$area['description'].'"><label
for="area'.$area['id'].'">'.$area['name'].'</label></td>
+        <tr id="trg'.$x.'" class="'.($x%2 ? 'even'
: 'odd').'"
onmouseover="'."hlRow('trg".$x."',1)".'"
onmouseout="'."hlRow('trg".$x."',2)".'">
+          <td title="'.$area['description'].'"><label
class="normal"
for="area'.$area['id'].'">'.$area['name'].'</label></td>
           <td><input type="checkbox" value="1"
name="area'.$area['id'].'"
id="area'.$area['id'].'"'.($is ? '
checked="checked"' : '').' /></td>
         </tr>');
     }

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_UserDetai…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
---
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_UserDetai…
[iso-8859-1] (original)
+++
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_UserDetai…
[iso-8859-1] Tue May  5 00:21:49 2009
@@ -37,7 +37,6 @@
   {
     parent::__construct();
 
-        echo $_GET['action'];
     // some userdata has to be updated ?
     if (isset($_GET['action'])) {
       switch ($_GET['action']) {

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
[iso-8859-1] Tue May  5 00:21:49 2009
@@ -367,8 +367,7 @@
             &nbsp;&nbsp;<span
id="mefasi">&nbsp;</span>
           </div>
         </div>
-      </div>
-      <div id="frmdiff"
style="display:none;"></div>');
+      </div>');
   } // end of member function showEditor
 
 

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserD…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
---
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserD…
[iso-8859-1] (original)
+++
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserD…
[iso-8859-1] Tue May  5 00:21:49 2009
@@ -74,8 +74,7 @@
         <p><strong>Registered:</strong>
'.$user['created'].'</p>
         <p>Account is
'.($user['disabled']==false?'enabled':'disabled').'
           &nbsp;(
-          <span class="frmeditbutton"
onclick="'."setAccount(".$user['id'].",
'".($user['disabled']==false?'disable':'enable')."')".'">&nbsp;'.($user['disabled']==false?'disable':'enable').'</span>

-          it)
+          <span class="virtualLink"
onclick="'."setAccount(".$user['id'].",
'".($user['disabled']==false?'disable':'enable')."')".'">'.($user['disabled']==false?'disable':'enable').'
account</span>)
         </p>');
     }
 

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Maintain.cl…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Maintain.cl…
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Maintain.cl…
[iso-8859-1] Tue May  5 00:21:49 2009
@@ -292,7 +292,7 @@
               <div id="pageAccess" style="display: none;">
                 <div class="toolbar">
                   <div class="button" onclick="addAccess()">
-                    <img
src="'.RosCMS::getInstance()->pathRosCMS().'images/clear.gif"
alt="" />
+                    <img
src="'.RosCMS::getInstance()->pathRosCMS().'images/new.png"
alt="" />
                     <span class="text">add new</span>
                   </div>
                 </div>
@@ -317,7 +317,7 @@
               <div id="pageGroups" style="display: none;">
                 <div class="toolbar">
                   <div class="button" onclick="addGroup()">
-                    <img
src="'.RosCMS::getInstance()->pathRosCMS().'images/clear.gif"
alt="" />
+                    <img
src="'.RosCMS::getInstance()->pathRosCMS().'images/new.png"
alt="" />
                     <span class="text">add new</span>
                   </div>
                 </div>
@@ -339,7 +339,7 @@
               <div id="pageLanguages" style="display: none;">
                 <div class="toolbar">
                   <div class="button" onclick="addLanguage()">
-                    <img
src="'.RosCMS::getInstance()->pathRosCMS().'images/clear.gif"
alt="" />
+                    <img
src="'.RosCMS::getInstance()->pathRosCMS().'images/new.png"
alt="" />
                     <span class="text">add new</span>
                   </div>
                 </div>

Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla…
[iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla…
[iso-8859-1] Tue May  5 00:21:49 2009
@@ -318,7 +318,7 @@
                 <div id="frmedithead" style="padding-bottom:
10px;">&nbsp;</div>
                 <div style="width:100%;">
                   <div id="editzone">&nbsp;</div>
-                  <div id="frmdiff"></div>
+                  <div id="frmdiff"
style="display:none;"></div>
                 </div>
               </div>
               <div id="previewarea" style="display:none;">