Code

Updated images and themes
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 16 Apr 2010 07:08:57 +0000 (07:08 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 16 Apr 2010 07:08:57 +0000 (07:08 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17658 594d385d-05f5-0310-b6e9-bd551577e9d8

54 files changed:
gosa-core/html/images/branch.gif [deleted file]
gosa-core/html/images/branchbottom.gif [deleted file]
gosa-core/html/images/branchtop.gif [deleted file]
gosa-core/html/images/configure.png [changed mode: 0755->0644]
gosa-core/html/images/date_active.gif [deleted file]
gosa-core/html/images/datepicker.gif [deleted file]
gosa-core/html/images/datepicker_ro.gif [deleted file]
gosa-core/html/images/error.png
gosa-core/html/images/folder-expanded.gif [deleted file]
gosa-core/html/images/folder.gif [deleted file]
gosa-core/html/images/info.png
gosa-core/html/images/ldapserver.png [deleted file]
gosa-core/html/images/lists/copy.png
gosa-core/html/images/lists/cut.png
gosa-core/html/images/lists/edit.png
gosa-core/html/images/lists/folder.png
gosa-core/html/images/lists/locked.png
gosa-core/html/images/lists/restore.png
gosa-core/html/images/lists/trash.png
gosa-core/html/images/lists/unlocked.png
gosa-core/html/images/login-head.png [deleted file]
gosa-core/html/images/minus.gif [deleted file]
gosa-core/html/images/minustop.gif [deleted file]
gosa-core/html/images/null.gif [deleted file]
gosa-core/html/images/password.png [deleted file]
gosa-core/html/images/plus.gif [deleted file]
gosa-core/html/images/plusbottom.gif [deleted file]
gosa-core/html/images/plustop.gif [deleted file]
gosa-core/html/images/save.png
gosa-core/html/images/select_department.png
gosa-core/html/images/warning.png
gosa-core/html/images/welcome.png [deleted file]
gosa-core/html/plugins/acl/images/new-role.png [deleted file]
gosa-core/html/plugins/acl/images/plugin.png
gosa-core/html/plugins/departments/images/dc.png
gosa-core/html/plugins/departments/images/department.png
gosa-core/html/plugins/departments/images/locality.png
gosa-core/html/plugins/departments/images/plugin.png
gosa-core/html/plugins/groups/images/plugin.png
gosa-core/html/plugins/ogroups/images/new.png [deleted file]
gosa-core/html/plugins/users/images/list_new_user.png [deleted file]
gosa-core/html/plugins/users/images/select_user.png
gosa-core/html/plugins/users/images/user.png
gosa-core/html/themes/modern/style.css
gosa-core/ihtml/themes/modern/islocked.tpl
gosa-core/ihtml/themes/modern/msg_dialog.tpl
gosa-core/ihtml/themes/modern/removeEntries.tpl
gosa-core/include/class_listing.inc
gosa-core/plugins/admin/acl/class_aclManagement.inc
gosa-core/plugins/admin/departments/class_departmentManagement.inc
gosa-core/plugins/admin/departments/dep-list.xml
gosa-core/plugins/admin/groups/class_groupManagement.inc
gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
gosa-core/plugins/admin/users/class_userManagement.inc

diff --git a/gosa-core/html/images/branch.gif b/gosa-core/html/images/branch.gif
deleted file mode 100644 (file)
index 9fe34c0..0000000
Binary files a/gosa-core/html/images/branch.gif and /dev/null differ
diff --git a/gosa-core/html/images/branchbottom.gif b/gosa-core/html/images/branchbottom.gif
deleted file mode 100644 (file)
index 278f6da..0000000
Binary files a/gosa-core/html/images/branchbottom.gif and /dev/null differ
diff --git a/gosa-core/html/images/branchtop.gif b/gosa-core/html/images/branchtop.gif
deleted file mode 100644 (file)
index 3d469d0..0000000
Binary files a/gosa-core/html/images/branchtop.gif and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/gosa-core/html/images/date_active.gif b/gosa-core/html/images/date_active.gif
deleted file mode 100644 (file)
index 132a364..0000000
Binary files a/gosa-core/html/images/date_active.gif and /dev/null differ
diff --git a/gosa-core/html/images/datepicker.gif b/gosa-core/html/images/datepicker.gif
deleted file mode 100644 (file)
index 7b4d6bf..0000000
Binary files a/gosa-core/html/images/datepicker.gif and /dev/null differ
diff --git a/gosa-core/html/images/datepicker_ro.gif b/gosa-core/html/images/datepicker_ro.gif
deleted file mode 100644 (file)
index a6caa10..0000000
Binary files a/gosa-core/html/images/datepicker_ro.gif and /dev/null differ
index 1de7a6fda07e70b050552b56d937b0988e00a00d..090220283d28a1c0974a0bb842b36162dbe2268a 100644 (file)
Binary files a/gosa-core/html/images/error.png and b/gosa-core/html/images/error.png differ
diff --git a/gosa-core/html/images/folder-expanded.gif b/gosa-core/html/images/folder-expanded.gif
deleted file mode 100644 (file)
index f779acc..0000000
Binary files a/gosa-core/html/images/folder-expanded.gif and /dev/null differ
diff --git a/gosa-core/html/images/folder.gif b/gosa-core/html/images/folder.gif
deleted file mode 100644 (file)
index 842989f..0000000
Binary files a/gosa-core/html/images/folder.gif and /dev/null differ
index 3626ba7ee6c9b77bac35febfa9503cc85f48114f..8f3a936dd5eb8189adae411e20c3322bdde667d8 100644 (file)
Binary files a/gosa-core/html/images/info.png and b/gosa-core/html/images/info.png differ
diff --git a/gosa-core/html/images/ldapserver.png b/gosa-core/html/images/ldapserver.png
deleted file mode 100644 (file)
index 313a661..0000000
Binary files a/gosa-core/html/images/ldapserver.png and /dev/null differ
index c3ff243b85f2d80a576da5225b81ce0793057841..5cdeb5fc73897c0b2b7fdb24a082a993cb2294c8 100644 (file)
Binary files a/gosa-core/html/images/lists/copy.png and b/gosa-core/html/images/lists/copy.png differ
index 7ec355a0dcf91ad072161b6eb1857943b12dcd4a..f4a55e3d8a9df86b0da8e7377eb4b21620e42580 100644 (file)
Binary files a/gosa-core/html/images/lists/cut.png and b/gosa-core/html/images/lists/cut.png differ
index a8b69f73fe3ed52ad616c4fbc6fca2679a9e8c1d..84e345d22430175e80c4ea1f1f17e6790649ee35 100644 (file)
Binary files a/gosa-core/html/images/lists/edit.png and b/gosa-core/html/images/lists/edit.png differ
index f7e8c351c4abd2828fe77348c570e0e7a28e3f33..536da3d1c39096335080a97d29953d38e382c121 100644 (file)
Binary files a/gosa-core/html/images/lists/folder.png and b/gosa-core/html/images/lists/folder.png differ
index 04a05c1cb1fec55b1d037f11b7340d8d24f9b969..c6d26f96527c5e246f60af7bf27f2bd89d44f542 100644 (file)
Binary files a/gosa-core/html/images/lists/locked.png and b/gosa-core/html/images/lists/locked.png differ
index 037c2da98d1c629fd33957baa64edc60197ef767..cb457a538f5ebf2db2b49ba94880fecef834a186 100644 (file)
Binary files a/gosa-core/html/images/lists/restore.png and b/gosa-core/html/images/lists/restore.png differ
index f5cb2b8b9128f0c6135942d53f1843e5f4d3f65b..1d20a3d24c488e6476e976939f579ad6ce9828e8 100644 (file)
Binary files a/gosa-core/html/images/lists/trash.png and b/gosa-core/html/images/lists/trash.png differ
index 3a1a0d34efe6d96efb2438dbd7ede8b9871e3cef..143bee4e9a13a37efebfa5b28d6a6bec676f9e57 100644 (file)
Binary files a/gosa-core/html/images/lists/unlocked.png and b/gosa-core/html/images/lists/unlocked.png differ
diff --git a/gosa-core/html/images/login-head.png b/gosa-core/html/images/login-head.png
deleted file mode 100644 (file)
index 45e3c35..0000000
Binary files a/gosa-core/html/images/login-head.png and /dev/null differ
diff --git a/gosa-core/html/images/minus.gif b/gosa-core/html/images/minus.gif
deleted file mode 100644 (file)
index 5ecff71..0000000
Binary files a/gosa-core/html/images/minus.gif and /dev/null differ
diff --git a/gosa-core/html/images/minustop.gif b/gosa-core/html/images/minustop.gif
deleted file mode 100644 (file)
index bab71e2..0000000
Binary files a/gosa-core/html/images/minustop.gif and /dev/null differ
diff --git a/gosa-core/html/images/null.gif b/gosa-core/html/images/null.gif
deleted file mode 100644 (file)
index c5b2954..0000000
Binary files a/gosa-core/html/images/null.gif and /dev/null differ
diff --git a/gosa-core/html/images/password.png b/gosa-core/html/images/password.png
deleted file mode 100644 (file)
index cfe82a9..0000000
Binary files a/gosa-core/html/images/password.png and /dev/null differ
diff --git a/gosa-core/html/images/plus.gif b/gosa-core/html/images/plus.gif
deleted file mode 100644 (file)
index 2671205..0000000
Binary files a/gosa-core/html/images/plus.gif and /dev/null differ
diff --git a/gosa-core/html/images/plusbottom.gif b/gosa-core/html/images/plusbottom.gif
deleted file mode 100644 (file)
index ba007c6..0000000
Binary files a/gosa-core/html/images/plusbottom.gif and /dev/null differ
diff --git a/gosa-core/html/images/plustop.gif b/gosa-core/html/images/plustop.gif
deleted file mode 100644 (file)
index 37ef1ae..0000000
Binary files a/gosa-core/html/images/plustop.gif and /dev/null differ
index 6a9adc13ce726f6e31379c706b7e8bd15a0615c7..8072aea3268164eb2028a0cebfe44da82b4f4aca 100644 (file)
Binary files a/gosa-core/html/images/save.png and b/gosa-core/html/images/save.png differ
index 2eeff8e272df35c34ae8720407dda6669b2d2964..1484c5cd7aca7f3063775373a4a3f31442aac7bc 100644 (file)
Binary files a/gosa-core/html/images/select_department.png and b/gosa-core/html/images/select_department.png differ
index d83f3491e6c19fb599db3be5d02a79ffa8a3def2..80bd694e7395ca6d32394b4fe756ec82115a7131 100644 (file)
Binary files a/gosa-core/html/images/warning.png and b/gosa-core/html/images/warning.png differ
diff --git a/gosa-core/html/images/welcome.png b/gosa-core/html/images/welcome.png
deleted file mode 100644 (file)
index fac7493..0000000
Binary files a/gosa-core/html/images/welcome.png and /dev/null differ
diff --git a/gosa-core/html/plugins/acl/images/new-role.png b/gosa-core/html/plugins/acl/images/new-role.png
deleted file mode 100644 (file)
index 95f99c0..0000000
Binary files a/gosa-core/html/plugins/acl/images/new-role.png and /dev/null differ
index 40b868f91c2cc1755492deea4b7eb1cd184af10c..b80c2a6fe13898dba5e9a519a2c37f7b01a5972e 100644 (file)
Binary files a/gosa-core/html/plugins/acl/images/plugin.png and b/gosa-core/html/plugins/acl/images/plugin.png differ
index 4d139278e29f51e4b36a8272425cb00562baf985..d2a954d44526a447e6f4e693324450868f7443b4 100644 (file)
Binary files a/gosa-core/html/plugins/departments/images/dc.png and b/gosa-core/html/plugins/departments/images/dc.png differ
index f7e8c351c4abd2828fe77348c570e0e7a28e3f33..536da3d1c39096335080a97d29953d38e382c121 100644 (file)
Binary files a/gosa-core/html/plugins/departments/images/department.png and b/gosa-core/html/plugins/departments/images/department.png differ
index 2eeff8e272df35c34ae8720407dda6669b2d2964..1484c5cd7aca7f3063775373a4a3f31442aac7bc 100644 (file)
Binary files a/gosa-core/html/plugins/departments/images/locality.png and b/gosa-core/html/plugins/departments/images/locality.png differ
index d5ac437c95a74672a4e3cae43e384d3a898e7aaf..4768036da11b9ae11fc9df308191e23d63826bc2 100644 (file)
Binary files a/gosa-core/html/plugins/departments/images/plugin.png and b/gosa-core/html/plugins/departments/images/plugin.png differ
index 1ce41bdd3ff108306cb7fd125ec9150912506936..e5577d08aeb7ab0bc7991f08e2bf6c04a0e69aa3 100644 (file)
Binary files a/gosa-core/html/plugins/groups/images/plugin.png and b/gosa-core/html/plugins/groups/images/plugin.png differ
diff --git a/gosa-core/html/plugins/ogroups/images/new.png b/gosa-core/html/plugins/ogroups/images/new.png
deleted file mode 100644 (file)
index 318715a..0000000
Binary files a/gosa-core/html/plugins/ogroups/images/new.png and /dev/null differ
diff --git a/gosa-core/html/plugins/users/images/list_new_user.png b/gosa-core/html/plugins/users/images/list_new_user.png
deleted file mode 100644 (file)
index 34ee112..0000000
Binary files a/gosa-core/html/plugins/users/images/list_new_user.png and /dev/null differ
index 83e5b318b8eb3b0e32a36e7e3c3b83c03b327179..b50ec42a5e86f71478526a925209af02c6dcaa7e 100644 (file)
Binary files a/gosa-core/html/plugins/users/images/select_user.png and b/gosa-core/html/plugins/users/images/select_user.png differ
index 4a5332b5a6107e201b0ebceeaf6388da7145cbe4..2a385e4d6aba06c31ef6f4b7a1e6ea1bfecb6c48 100644 (file)
Binary files a/gosa-core/html/plugins/users/images/user.png and b/gosa-core/html/plugins/users/images/user.png differ
index 29f9b23330b66719e96b885475b743cae9202742..73d80b0ba2cb266ccb795a32e60b686cca09942c 100644 (file)
@@ -94,17 +94,6 @@ h1, h3 {
   font-weight:bold;
 }
 
-/* Image with migration color */
-img, input[type=image] {
-  border:1px solid red;
-  background-color:rgba(255,0,0,0.2);
-}
-
-/* Input with migration color */
-input[type=submit] {
-  border:1px solid red;
-}
-
 .required{
   font-size:xx-small;
   vertical-align:top;
@@ -780,6 +769,14 @@ div.listContainer {
   background-color:#F5F5F5;
 }
 
+.listScrollContent tr.entry-locked:nth-child(odd) {
+  background-color:#FFA;
+}
+
+.listScrollContent tr.entry-locked:nth-child(even) {
+  background-color:#F5F5AA;
+}
+
 .listScrollContent tr:last-child {
   background-color:#FFF;
 }
@@ -1360,6 +1357,10 @@ background-image:none;
   text-align:bottom;
 }
 
+.inline-warning-text {
+  display:inline-block;
+  padding-top:13px;
+}
 
 /* Progress */
 
@@ -1448,11 +1449,12 @@ div.progress {
 .login-input {
   position:absolute;
   left:10em;
-  right:5px;
+  right:30px
 }
 
 .login-input input{
-  width:92%;
+  position:absolute;
+  width:100%;
 }
 
 .login-inline-message {
index 27cf883f0a8afaeee18ba6e88ff30cd170601eca..566c1d43244c334bcdcd4c3f6659047cb2b91726 100644 (file)
@@ -1,6 +1,7 @@
 <div class='plugin'>
  <div class='inline-warning'>
-   {image path="images/encrypted.png" align="top"}&nbsp;{t}Locking conflict detected{/t}
+  {image path="images/encrypted.png" align="top"}
+  <div class='inline-warning-text'>{t}Locking conflict detected{/t}</div>
  </div>
 
  <hr>
index 042f033befb24e3c92adea4b12694a2f0737b72d..6d8e4f24abf7def615733bc0ace19c6b1223fbe8 100644 (file)
@@ -60,7 +60,7 @@
                {elseif $i_Type == $smarty.const.INFO_DIALOG || $i_Type == $smarty.const.CONFIRM_DIALOG || $i_Type == $smarty.const.OK_CANCEL_DIALOG}
                                                {image path='images/warning.png'}
                {/if}
-                       </td><td style='font-size: 1.1em; font-weight:bold;'>{$s_Title}</td></tr>
+                       </td><td style='font-size: 1.1em;vertical-align:middle;font-weight:bold;'>{$s_Title}</td></tr>
                        </table>
                        </div>
                        <table summary='{t}Error message{/t}' 
                {elseif $i_Type == $smarty.const.INFO_DIALOG || $i_Type == $smarty.const.CONFIRM_DIALOG || $i_Type == $smarty.const.OK_CANCEL_DIALOG}
                                                {image path='images/info.png'}
                {/if}
-                       </td><td style='font-size: 1.1em; font-weight:bold;'>{$s_Title}</td></tr>
+                       </td><td style='font-size: 1.1em;vertical-align:middle; font-weight:bold;'>{$s_Title}</td></tr>
                </table>
                </div>
 
                        <table summary='{t}Error message{/t}' 
         style='z-index:250;width:100%; border-top: solid 1px #BBBBBB;' cellspacing=0 cellpadding=2 border=0>
                                <tr>
-                                       <td style='width:100%; padding:7px; padding-bottom:14px;'>
+                                       <td style='width:100%;padding:7px; padding-bottom:14px;'>
                                                {$s_Message}
                                                <br>
                                        </td>
index 30a39ac73de72740b7a638ac172cdcf7fe7e7c5a..611030e61f1afb9bbd8392b87ef4553a59742b84 100644 (file)
@@ -1,6 +1,7 @@
 <div class=plugin>
  <div class='inline-warning'>
-  {image path="images/warning.png" align="top"}&nbsp;{t}Attention{/t}
+  {image path="images/warning.png" align="top"}
+  <div class='inline-warning-text'>{t}Attention{/t}</div>
  </div>
 
  <hr>
index 3f3555cea16fc6f68d4b446a069878d23d836ee3..8b32798177430cd6ccb8940de0e4f19dc4d9f6ad 100644 (file)
@@ -388,8 +388,16 @@ class listing {
     // Complete list by sorting entries for _sort$index and appending them to the output
     $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType);
     foreach ($entryIterator as $row => $entry){
-      $result.="<tr>\n";
-      $result.= $entry['_rendered'];
+
+      // Apply custom class to row?
+      if (preg_match("/<rowClass:([a-z0-9_-]*)\/>/i", $entry['_rendered'], $matches)) {
+        $result.="<tr class='".$matches[1]."'>\n";
+        $result.= preg_replace("/<rowClass[^>]+>/", '', $entry['_rendered']);
+      } else {
+        $result.="<tr>\n";
+        $result.= $entry['_rendered'];
+      }
+
       $result.="</tr>\n";
       $alt++;
     }
@@ -409,6 +417,7 @@ class listing {
           $result.= "<td class='list1nohighlight' style='border-right:0;$emptyListStyle'>&nbsp;</td>";
         }
       }
+
       $result.= "</tr>";
     }
 
index da373908b4a17cbe61dd6ad282c7ed068307d9a9..8a8a7756cb63ef04930871ea43da489bdf900e7f 100644 (file)
@@ -22,8 +22,8 @@
 
 class aclManagement extends management
 {
-  var $plHeadline     = "Acl";
-  var $plDescription  = "Manage access control lists";
+  var $plHeadline     = "Access control";
+  var $plDescription  = "Control access to GOsa managed objects down to attribute and action level";
   var $plIcon  = "plugins/acl/images/plugin.png";
 
   // Tab definition 
index 056569d7e8bdcb29ebea16b14bcaa3814eb70b77..84382e4e3be9cad97338a1f75d92eee08518eb74 100644 (file)
@@ -22,8 +22,8 @@
 
 class departmentManagement extends management
 {
-  var $plHeadline     = "Departments";
-  var $plDescription  = "Manage Departments";
+  var $plHeadline     = "Directory structure";
+  var $plDescription  = "Manage organizations, organizational units, localities, countries and more";
   var $plIcon         = "plugins/departments/images/plugin.png";
 
   // Tab definition 
index 62f547bae3a7de32abb1ea2c64a80653b76159e2..441485db2b91c7ff7fef9fadf0082f850d1934f5 100644 (file)
@@ -8,7 +8,7 @@
     <multiSelect>true</multiSelect>
     <template>dep-list.tpl</template>
     <module>departments</module>
-    <label>List of departments</label>
+    <label>List of structural objects</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
index 0c8031749f2df9cd93161bac6cc2685f4cce67b8..7e600b6bbb9ca3b5f23ef022d6bcfa7606bfd45c 100644 (file)
@@ -23,7 +23,7 @@
 class groupManagement extends management
 {
   var $plHeadline     = "Groups";
-  var $plDescription  = "Group administration";
+  var $plDescription  = "Manage aspects of groups like members, posix, desktop, samba and mail settings";
   var $plIcon  = "plugins/groups/images/plugin.png";
 
   // Tab definition 
index cfde13495aef80c3bdd2ac63f21d20bf70505efc..800d36ba4a954bc640eb2fae76cd3d33786059d7 100644 (file)
@@ -23,7 +23,7 @@
 class ogroupManagement extends management
 {
   var $plHeadline     = "Object groups";
-  var $plDescription  = "Manage object groups";
+  var $plDescription  = "Combine different types of objects to make use of this relationship";
   var $plIcon  = "plugins/ogroups/images/plugin.png";
 
   // Tab definition 
index 6261c7060ab6b0ce5217c1d13ee2e4590d8da465..ab0d224943c7e6a540a8078a42dca0db7b6d3275 100644 (file)
@@ -23,7 +23,7 @@
 class userManagement extends management
 {
   var $plHeadline     = "Users";
-  var $plDescription  = "Manage users";
+  var $plDescription  = "Manage aspects of user accounts like generic, posix, samba and mail settings";
   var $plIcon  = "plugins/users/images/user.png";
 
   var $sn = "";
@@ -738,7 +738,7 @@ class userManagement extends management
     $label= "";
     if(isset($userPassword[0]) && preg_match("/^\{[^\}]/",$userPassword[0])){
       if(preg_match("/^[^\}]*+\}!/",$userPassword[0])){
-        $label= _("Unlock account");
+        $label= _("Unlock account")."<rowClass:entry-locked/>";
       }else{
         $label= _("Lock account");
       }