From: cajus Date: Wed, 16 Apr 2008 06:21:19 +0000 (+0000) Subject: Moved images around X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fa58495986757601c68acd395e0e165d037b603c;p=gosa.git Moved images around git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10483 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf index c87bca3a1..5471185f1 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -3,8 +3,7 @@ {$get_gosa_version}
- + assign ('date', gmdate("D, d M Y H:i:s")); $smarty->assign ('username', $username); - $smarty->assign ('personal_img', get_template_path('images/personal.png')); + $smarty->assign ('personal_img', get_template_path('images/login-head.png')); $smarty->assign ('password_img', get_template_path('images/password.png')); $smarty->assign ('directory_img', get_template_path('images/ldapserver.png')); @@ -403,7 +403,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces /* Fill template with required values */ $smarty->assign ('date', gmdate("D, d M Y H:i:s")); $smarty->assign ('username', $username); -$smarty->assign ('personal_img', get_template_path('images/personal.png')); +$smarty->assign ('personal_img', get_template_path('images/login-head.png')); $smarty->assign ('password_img', get_template_path('images/password.png')); $smarty->assign ('directory_img', get_template_path('images/ldapserver.png')); diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index 508cb8c10..6de3e86ac 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -291,7 +291,7 @@ $smarty->assign ("username", $ui->username); $smarty->assign ("go_logo", get_template_path('images/go_logo.png')); $smarty->assign ("go_base", get_template_path('images/dtree.png')); $smarty->assign ("go_home", get_template_path('images/gohome.png')); -$smarty->assign ("go_out", get_template_path('images/stop.png')); +$smarty->assign ("go_out", get_template_path('images/logout.png')); $smarty->assign ("go_top", get_template_path('images/go_top.png')); $smarty->assign ("go_corner", get_template_path('images/go_corner.png')); $smarty->assign ("go_left", get_template_path('images/go_left.png')); diff --git a/gosa-core/html/plugins/acl/images/new-role.png b/gosa-core/html/plugins/acl/images/new-role.png new file mode 100644 index 000000000..95f99c004 Binary files /dev/null and b/gosa-core/html/plugins/acl/images/new-role.png differ diff --git a/gosa-core/html/plugins/departments/images/department.png b/gosa-core/html/plugins/departments/images/department.png new file mode 100644 index 000000000..3d26af552 Binary files /dev/null and b/gosa-core/html/plugins/departments/images/department.png differ diff --git a/gosa-core/html/plugins/generic/images/head.png b/gosa-core/html/plugins/generic/images/head.png new file mode 100644 index 000000000..83e5b318b Binary files /dev/null and b/gosa-core/html/plugins/generic/images/head.png differ diff --git a/gosa-core/html/plugins/generic/images/plugin.png b/gosa-core/html/plugins/generic/images/plugin.png new file mode 100644 index 000000000..45e3c3528 Binary files /dev/null and b/gosa-core/html/plugins/generic/images/plugin.png differ diff --git a/gosa-core/html/themes/default/style.css b/gosa-core/html/themes/default/style.css index 2592cb8d1..d93a98534 100644 --- a/gosa-core/html/themes/default/style.css +++ b/gosa-core/html/themes/default/style.css @@ -471,7 +471,7 @@ div.tab_active { } div#notify { - background-image: url("../../images/lamp.png"); + background-image: url("../../images/lists/on.png"); background-repeat:no-repeat; background-position:1px 1px; padding-left:18px; diff --git a/gosa-core/ihtml/themes/default/remove.tpl b/gosa-core/ihtml/themes/default/remove.tpl index 2d063a133..d413beab7 100644 --- a/gosa-core/ihtml/themes/default/remove.tpl +++ b/gosa-core/ihtml/themes/default/remove.tpl @@ -1,5 +1,5 @@
-  {t}Warning{/t} +  {t}Warning{/t}

{$intro} diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc index 00f0a4b97..0105ecc2a 100644 --- a/gosa-core/plugins/admin/acl/class_divListACL.inc +++ b/gosa-core/plugins/admin/acl/class_divListACL.inc @@ -151,18 +151,18 @@ class divListACL extends MultiSelectWindow $listhead = MultiSelectWindow::get_default_header(); $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ if(preg_match("/c/",$acl)) { - $s.= "...|". + $s.= "...|". " "._("Role")."|new_acl_role|\n"; } diff --git a/gosa-core/plugins/admin/acl/remove.tpl b/gosa-core/plugins/admin/acl/remove.tpl index 9d13ebe6d..2e74cdcd8 100644 --- a/gosa-core/plugins/admin/acl/remove.tpl +++ b/gosa-core/plugins/admin/acl/remove.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

{$info} diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc index b56e5b3bd..1e451ddd4 100644 --- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc +++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc @@ -142,12 +142,12 @@ class divListDepartment extends MultiSelectWindow $listhead .= " "._("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl index a18e7932c..0ca303959 100644 --- a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl +++ b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} - {t}You are currently moving/renaming this department.{/t} +  {t}Warning{/t} - {t}You are currently moving/renaming this department.{/t}

{t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t} diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl index 36921ad1e..da26e94d7 100644 --- a/gosa-core/plugins/admin/departments/generic.tpl +++ b/gosa-core/plugins/admin/departments/generic.tpl @@ -53,7 +53,7 @@   -

{t}Location{/t}

+

{t}Location{/t}

diff --git a/gosa-core/plugins/admin/departments/remove.tpl b/gosa-core/plugins/admin/departments/remove.tpl index 36b1fa89a..ce2f63071 100644 --- a/gosa-core/plugins/admin/departments/remove.tpl +++ b/gosa-core/plugins/admin/departments/remove.tpl @@ -1,5 +1,5 @@
-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc index 0e40cd438..543509df3 100644 --- a/gosa-core/plugins/admin/groups/class_divListGroup.inc +++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc @@ -173,13 +173,13 @@ class divListGroup extends MultiSelectWindow /* Add department selection */ $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc index a0f4fc79f..1e78305ba 100644 --- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc +++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc @@ -231,7 +231,7 @@ class group extends plugin /* Do we represent a valid group? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ".msgPool::noValidExtension().""; + $display= "\"\" ".msgPool::noValidExtension().""; return ($display); } diff --git a/gosa-core/plugins/admin/groups/remove.tpl b/gosa-core/plugins/admin/groups/remove.tpl index c4405a19e..39157da1a 100644 --- a/gosa-core/plugins/admin/groups/remove.tpl +++ b/gosa-core/plugins/admin/groups/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc index 3201b5c6c..dfd5acb46 100644 --- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc @@ -191,13 +191,13 @@ class divListOGroup extends MultiSelectWindow /* Add department selector */ $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index ea6abd637..fa0c66ca1 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -186,7 +186,7 @@ class ogroup extends plugin /* Do we represent a valid group? */ if (!$this->is_account){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension("object group").""; return ($display); } diff --git a/gosa-core/plugins/admin/ogroups/remove.tpl b/gosa-core/plugins/admin/ogroups/remove.tpl index 1f244deee..2b809b9b5 100644 --- a/gosa-core/plugins/admin/ogroups/remove.tpl +++ b/gosa-core/plugins/admin/ogroups/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc index 15401fbeb..5117b0b09 100644 --- a/gosa-core/plugins/admin/users/class_divListUsers.inc +++ b/gosa-core/plugins/admin/users/class_divListUsers.inc @@ -160,20 +160,20 @@ class divListUsers extends MultiSelectWindow $listhead = MultiSelectWindow::get_default_header(); $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ if(preg_match("/c/",$acl)) { $s.= "...|". " "._("User")."|user_new|\n"; - $s.= "...|". + $s.= "...|". " "._("Template")."|user_tplnew|\n"; } @@ -281,7 +281,7 @@ class divListUsers extends MultiSelectWindow name='user_edit_%KEY%-sambaAccount' title='"._("Edit samba properties")."'>"; $netatalkimg = ""; - $tplcreateuserimg = ""; /******************** diff --git a/gosa-core/plugins/admin/users/remove.tpl b/gosa-core/plugins/admin/users/remove.tpl index 3d9af5de5..8424e7401 100644 --- a/gosa-core/plugins/admin/users/remove.tpl +++ b/gosa-core/plugins/admin/users/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index 15ab39c97..8d4e92706 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -308,7 +308,7 @@ class user extends plugin /* Do we represent a valid gosaAccount? */ if (!$this->is_account){ - $str = "\"\" ". + $str = "\"\" ". msgPool::noValidExtension("GOsa").""; return($str); } diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl index a0130e8f2..0908aa51d 100644 --- a/gosa-core/plugins/personal/generic/generic.tpl +++ b/gosa-core/plugins/personal/generic/generic.tpl @@ -3,7 +3,7 @@

diff --git a/gosa-core/plugins/personal/generic/generic_picture.tpl b/gosa-core/plugins/personal/generic/generic_picture.tpl index 3ca587734..de7225509 100644 --- a/gosa-core/plugins/personal/generic/generic_picture.tpl +++ b/gosa-core/plugins/personal/generic/generic_picture.tpl @@ -2,7 +2,7 @@ diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc index 0b6dcdcc2..4f5b33c24 100644 --- a/gosa-core/plugins/personal/generic/main.inc +++ b/gosa-core/plugins/personal/generic/main.inc @@ -179,7 +179,7 @@ if (!$remove_lock){ /* Only display edit button if there is at least one attribute editable */ if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/user"))){ if ($fn == "edit"){ - $info.= "\"\" ". + $info.= "\"\" ". msgPool::clickEditToChange(); $display.= "\n"; } @@ -191,7 +191,7 @@ if (!$remove_lock){ } /* Page header*/ - $display= print_header(get_template_path('images/personal.png'), + $display= print_header(get_template_path('plugins/generic/images/plugin.png'), _("Generic user information"), $info).$display; } diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index 6fb52cc3e..cf1dae04f 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -271,7 +271,7 @@ class posixAccount extends plugin /* Do we represent a valid posixAccount? */ if (!$this->is_account && $this->parent === NULL ){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("POSIX")).""; $display.= back_to_main(); return ($display); diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc index 5199eb73c..0ce027772 100644 --- a/gosa-core/plugins/personal/posix/main.inc +++ b/gosa-core/plugins/personal/posix/main.inc @@ -116,7 +116,7 @@ if (!$remove_lock){ /* Only display edit button if there is at least one attribute editable */ if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/posixAccount"))){ - $info.= "\"\" ". + $info.= "\"\" ". msgPool::clickEditToChange(); $display.= "\n";
-

{t}Personal information{/t}

+

{t}Personal information{/t}
-

{t}Personal picture{/t}

+

{t}Personal picture{/t}