From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 16 Apr 2010 07:08:57 +0000 (+0000)
Subject: Updated images and themes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f16bab46136acb7c0d80fcb56ba41ffd1105c7e8;p=gosa.git

Updated images and themes


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17658 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/images/branch.gif b/gosa-core/html/images/branch.gif
deleted file mode 100644
index 9fe34c0bc..000000000
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
index 278f6da77..000000000
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
index 3d469d0a9..000000000
Binary files a/gosa-core/html/images/branchtop.gif and /dev/null differ
diff --git a/gosa-core/html/images/configure.png b/gosa-core/html/images/configure.png
old mode 100755
new mode 100644
diff --git a/gosa-core/html/images/date_active.gif b/gosa-core/html/images/date_active.gif
deleted file mode 100644
index 132a3643c..000000000
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
index 7b4d6bfe2..000000000
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
index a6caa10ab..000000000
Binary files a/gosa-core/html/images/datepicker_ro.gif and /dev/null differ
diff --git a/gosa-core/html/images/error.png b/gosa-core/html/images/error.png
index 1de7a6fda..090220283 100644
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
index f779acc73..000000000
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
index 842989f2e..000000000
Binary files a/gosa-core/html/images/folder.gif and /dev/null differ
diff --git a/gosa-core/html/images/info.png b/gosa-core/html/images/info.png
index 3626ba7ee..8f3a936dd 100644
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
index 313a66152..000000000
Binary files a/gosa-core/html/images/ldapserver.png and /dev/null differ
diff --git a/gosa-core/html/images/lists/copy.png b/gosa-core/html/images/lists/copy.png
index c3ff243b8..5cdeb5fc7 100644
Binary files a/gosa-core/html/images/lists/copy.png and b/gosa-core/html/images/lists/copy.png differ
diff --git a/gosa-core/html/images/lists/cut.png b/gosa-core/html/images/lists/cut.png
index 7ec355a0d..f4a55e3d8 100644
Binary files a/gosa-core/html/images/lists/cut.png and b/gosa-core/html/images/lists/cut.png differ
diff --git a/gosa-core/html/images/lists/edit.png b/gosa-core/html/images/lists/edit.png
index a8b69f73f..84e345d22 100644
Binary files a/gosa-core/html/images/lists/edit.png and b/gosa-core/html/images/lists/edit.png differ
diff --git a/gosa-core/html/images/lists/folder.png b/gosa-core/html/images/lists/folder.png
index f7e8c351c..536da3d1c 100644
Binary files a/gosa-core/html/images/lists/folder.png and b/gosa-core/html/images/lists/folder.png differ
diff --git a/gosa-core/html/images/lists/locked.png b/gosa-core/html/images/lists/locked.png
index 04a05c1cb..c6d26f965 100644
Binary files a/gosa-core/html/images/lists/locked.png and b/gosa-core/html/images/lists/locked.png differ
diff --git a/gosa-core/html/images/lists/restore.png b/gosa-core/html/images/lists/restore.png
index 037c2da98..cb457a538 100644
Binary files a/gosa-core/html/images/lists/restore.png and b/gosa-core/html/images/lists/restore.png differ
diff --git a/gosa-core/html/images/lists/trash.png b/gosa-core/html/images/lists/trash.png
index f5cb2b8b9..1d20a3d24 100644
Binary files a/gosa-core/html/images/lists/trash.png and b/gosa-core/html/images/lists/trash.png differ
diff --git a/gosa-core/html/images/lists/unlocked.png b/gosa-core/html/images/lists/unlocked.png
index 3a1a0d34e..143bee4e9 100644
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
index 45e3c3528..000000000
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
index 5ecff71d3..000000000
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
index bab71e29a..000000000
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
index c5b2954ac..000000000
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
index cfe82a935..000000000
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
index 267120578..000000000
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
index ba007c66d..000000000
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
index 37ef1aed3..000000000
Binary files a/gosa-core/html/images/plustop.gif and /dev/null differ
diff --git a/gosa-core/html/images/save.png b/gosa-core/html/images/save.png
index 6a9adc13c..8072aea32 100644
Binary files a/gosa-core/html/images/save.png and b/gosa-core/html/images/save.png differ
diff --git a/gosa-core/html/images/select_department.png b/gosa-core/html/images/select_department.png
index 2eeff8e27..1484c5cd7 100644
Binary files a/gosa-core/html/images/select_department.png and b/gosa-core/html/images/select_department.png differ
diff --git a/gosa-core/html/images/warning.png b/gosa-core/html/images/warning.png
index d83f3491e..80bd694e7 100644
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
index fac7493d2..000000000
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
index 95f99c004..000000000
Binary files a/gosa-core/html/plugins/acl/images/new-role.png and /dev/null differ
diff --git a/gosa-core/html/plugins/acl/images/plugin.png b/gosa-core/html/plugins/acl/images/plugin.png
index 40b868f91..b80c2a6fe 100644
Binary files a/gosa-core/html/plugins/acl/images/plugin.png and b/gosa-core/html/plugins/acl/images/plugin.png differ
diff --git a/gosa-core/html/plugins/departments/images/dc.png b/gosa-core/html/plugins/departments/images/dc.png
index 4d139278e..d2a954d44 100644
Binary files a/gosa-core/html/plugins/departments/images/dc.png and b/gosa-core/html/plugins/departments/images/dc.png differ
diff --git a/gosa-core/html/plugins/departments/images/department.png b/gosa-core/html/plugins/departments/images/department.png
index f7e8c351c..536da3d1c 100644
Binary files a/gosa-core/html/plugins/departments/images/department.png and b/gosa-core/html/plugins/departments/images/department.png differ
diff --git a/gosa-core/html/plugins/departments/images/locality.png b/gosa-core/html/plugins/departments/images/locality.png
index 2eeff8e27..1484c5cd7 100644
Binary files a/gosa-core/html/plugins/departments/images/locality.png and b/gosa-core/html/plugins/departments/images/locality.png differ
diff --git a/gosa-core/html/plugins/departments/images/plugin.png b/gosa-core/html/plugins/departments/images/plugin.png
index d5ac437c9..4768036da 100644
Binary files a/gosa-core/html/plugins/departments/images/plugin.png and b/gosa-core/html/plugins/departments/images/plugin.png differ
diff --git a/gosa-core/html/plugins/groups/images/plugin.png b/gosa-core/html/plugins/groups/images/plugin.png
index 1ce41bdd3..e5577d08a 100644
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
index 318715a4d..000000000
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
index 34ee112b1..000000000
Binary files a/gosa-core/html/plugins/users/images/list_new_user.png and /dev/null differ
diff --git a/gosa-core/html/plugins/users/images/select_user.png b/gosa-core/html/plugins/users/images/select_user.png
index 83e5b318b..b50ec42a5 100644
Binary files a/gosa-core/html/plugins/users/images/select_user.png and b/gosa-core/html/plugins/users/images/select_user.png differ
diff --git a/gosa-core/html/plugins/users/images/user.png b/gosa-core/html/plugins/users/images/user.png
index 4a5332b5a..2a385e4d6 100644
Binary files a/gosa-core/html/plugins/users/images/user.png and b/gosa-core/html/plugins/users/images/user.png differ
diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 29f9b2333..73d80b0ba 100644
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -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 {
diff --git a/gosa-core/ihtml/themes/modern/islocked.tpl b/gosa-core/ihtml/themes/modern/islocked.tpl
index 27cf883f0..566c1d432 100644
--- a/gosa-core/ihtml/themes/modern/islocked.tpl
+++ b/gosa-core/ihtml/themes/modern/islocked.tpl
@@ -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>
diff --git a/gosa-core/ihtml/themes/modern/msg_dialog.tpl b/gosa-core/ihtml/themes/modern/msg_dialog.tpl
index 042f033be..6d8e4f24a 100644
--- a/gosa-core/ihtml/themes/modern/msg_dialog.tpl
+++ b/gosa-core/ihtml/themes/modern/msg_dialog.tpl
@@ -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}' 
@@ -108,14 +108,14 @@
 		{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>
diff --git a/gosa-core/ihtml/themes/modern/removeEntries.tpl b/gosa-core/ihtml/themes/modern/removeEntries.tpl
index 30a39ac73..611030e61 100644
--- a/gosa-core/ihtml/themes/modern/removeEntries.tpl
+++ b/gosa-core/ihtml/themes/modern/removeEntries.tpl
@@ -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>
diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 3f3555cea..8b3279817 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -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>";
     }
 
diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc
index da373908b..8a8a7756c 100644
--- a/gosa-core/plugins/admin/acl/class_aclManagement.inc
+++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc
@@ -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 
diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index 056569d7e..84382e4e3 100644
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -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 
diff --git a/gosa-core/plugins/admin/departments/dep-list.xml b/gosa-core/plugins/admin/departments/dep-list.xml
index 62f547bae..441485db2 100644
--- a/gosa-core/plugins/admin/departments/dep-list.xml
+++ b/gosa-core/plugins/admin/departments/dep-list.xml
@@ -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>
diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index 0c8031749..7e600b6bb 100644
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -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 
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index cfde13495..800d36ba4 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -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 
diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 6261c7060..ab0d22494 100644
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -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");
       }