From: Roland Häder Date: Thu, 25 Oct 2012 16:18:32 +0000 (+0000) Subject: Project continued: X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=5e7d3d73ba4bbf6221739746e250406ad5f80736 Project continued: - Move some theme-related language ids to ext-theme - Added header to admin_edit_theme.tpl - Added CSS classes header_column and footer_column to general.css --- diff --git a/inc/language/de.php b/inc/language/de.php index 628fe539bd..6e8b5e7a9e 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -785,8 +785,6 @@ addMessages(array( 'CURRENT_THEME_IS' => "Aktuelles Design:", 'ADMIN_NO_THEME_INSTALLED_WARNING' => "Kein Design installiert.", 'CHANGE_THEME' => "Design ändern", - 'ADMIN_SET_AS_NEW_THEME' => "Dieses Theme als Standard-Theme setzen", - 'ADMIN_THEME_NEW_DEFAULT_THEME' => "Durch Anklicken des Uni*-Names wird das jeweilige Theme als Standard-Theme gesetzt, welches Ihre Besucher sofort sehen werden.", 'ADMIN_ENTRY_DELETE' => "Eintrag löschen", 'ADMIN_NO_MENUS_FOUND' => "Keine Menüs gefunden.", 'ADMIN_CONFIG_TITLE_SETTINGS' => "Einstellungen und Dekorationen am Browsertitel", @@ -940,6 +938,7 @@ addMessages(array( 'ADMIN_CONTINUE_LOGIN' => "Weiter zum Administratorlogin", 'ADMIN_RESET_PASSWORD_LINK' => "Jetzt Ihr Administratorkennwort zurücksetzen (nötiger Schritt!)", 'ADMIN_SUPPORT_FORUM_LINK' => "Direktlink zum Support-Forum (neues Fenster)", + 'ADMIN_MAILER_HOME_LINK' => "Direktlink zu mxchange.org (neues Fenster)", 'ADMIN_SUPPORT_BUGTRACKER_LINK' => "Direktlink zum Bug-Tracker (neues Fenster)", 'ADMIN_SUPPORT_WIKI_LINK' => "Direktlink zum Doku-Wiki (neues Fenster)", 'ADMIN_SUPPORT_CIAVC_LINK' => "Direktlink zu CIA.vc (neues Fenster)", diff --git a/inc/language/nickname_de.php b/inc/language/nickname_de.php index 58bdc921bf..5f725ef053 100644 --- a/inc/language/nickname_de.php +++ b/inc/language/nickname_de.php @@ -49,6 +49,7 @@ addMessages(array( 'ADMIN_CONFIG_NICKNAME_CHARACTERS' => "Zeichenfolge für Sprachdatei", // Admin - nickname history + 'ADMIN_LIST_NICKNAME_HISTORY_404' => "Das ausgewählte Mitglied {%%pipe,generateUserProfileLink=%s%%} hat noch keinen Nicknamen angelegt. Daher konnten auch keine Historie-Einträge gefunden werden.", 'ADMIN_LIST_NICKNAME_HISTORY_TITLE' => "Alle verwendeten Nicknames des Mitgliedes {%get,generateUserProfileLink=userid%}", // Member diff --git a/inc/language/theme_de.php b/inc/language/theme_de.php index cb0199e934..f8a6f1276b 100644 --- a/inc/language/theme_de.php +++ b/inc/language/theme_de.php @@ -48,6 +48,9 @@ addMessages(array( 'ADMIN_THEME_ALREADY_INSTALLED' => "Theme %s bereits installiert.", 'ADMIN_THEME_NOTHING_FOUND' => "Keine Themes auf dem Server gefunden.", 'ADMIN_THEME_INC_404' => "Wichtige Design-Headerdatei theme.php konnte zum Design %s nicht gefunden werden.", + 'ADMIN_SET_AS_NEW_THEME' => "Dieses Theme als Standard-Theme setzen", + 'ADMIN_EDIT_THEME_TITLE' => "Designs ändern, Standarddesign setzen", + 'ADMIN_EDIT_THEME_NOTICE' => "Durch Anklicken des Uni*-Names wird das jeweilige Theme als Standard-Theme gesetzt, welches Ihre Besucher sofort sehen werden.", )); // [EOF] diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 9ed9029b22..ae2c3ff311 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -723,8 +723,8 @@ function generateUserProfileLink ($userid, $title = '', $what = '') { // Is what set? if (empty($what)) { - // Then get it - $what = getWhat(); + // Then get it to 'list_user' + $what = 'list_user'; } // END - if if (($title == '0') && ($what == 'list_refs')) { diff --git a/templates/de/html/admin/admin_edit_theme.tpl b/templates/de/html/admin/admin_edit_theme.tpl index 1fee672373..d637385785 100644 --- a/templates/de/html/admin/admin_edit_theme.tpl +++ b/templates/de/html/admin/admin_edit_theme.tpl @@ -1,6 +1,11 @@
+ + + @@ -21,7 +26,7 @@
- {--ADMIN_THEME_NEW_DEFAULT_THEME--} + {--ADMIN_EDIT_THEME_NOTICE--}
diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl index a3b18bcd88..5ab0d215fd 100644 --- a/templates/de/html/admin/admin_footer.tpl +++ b/templates/de/html/admin/admin_footer.tpl @@ -2,6 +2,7 @@
  • {--ADMIN_BACK_TO_GUEST_MENU--}
    • +
  • {--ADMIN_MAILER_HOME_LINK--}
  • {--ADMIN_SUPPORT_FORUM_LINK--}
  • {--ADMIN_SUPPORT_BUGTRACKER_LINK--}
  • {--ADMIN_SUPPORT_WIKI_LINK--}
    • diff --git a/theme/business/css/general.css b/theme/business/css/general.css index 73f794f668..ef6be1c750 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -246,6 +246,20 @@ a.logout_box { padding-top: 5px; } +.header_column { + height: 23px; + background-color: #eeeeff; + color: #000000; + text-align: center; +} + +.footer_column { + height: 23px; + background-color: #eeeeff; + color: #000000; +} + + .guest_login_header { color: #000000; vertical-align: middle; diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index 1e30da0d3f..c1a51b0be5 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -214,6 +214,20 @@ a.logout_box { padding-top: 5px; } +.header_column { + height: 23px; + background-color: #cccc00; + color: #880000; + text-align: center; +} + +.footer_column { + height: 23px; + background-color: #cccc00; + color: #880000; +} + + .guest_login_header { color: #880000; vertical-align: middle; diff --git a/theme/org/css/general.css b/theme/org/css/general.css index 7a926aed3e..d3bf0e0d31 100644 --- a/theme/org/css/general.css +++ b/theme/org/css/general.css @@ -214,6 +214,19 @@ pre { padding-top: 5px; } +.header_column { + height: 23px; + background-color: #ddeedd; + color: #000000; + text-align: center; +} + +.footer_column { + height: 23px; + background-color: #ddeedd; + color: #000000; +} + .guest_login_header { color: #000000; vertical-align: middle; diff --git a/theme/schleuder/css/general.css b/theme/schleuder/css/general.css index 3dce90d393..d5d27ecb1a 100644 --- a/theme/schleuder/css/general.css +++ b/theme/schleuder/css/general.css @@ -1,6 +1,6 @@ body { background-color : #0571cc; - color : #FFFFFF; + color : #ffffff; font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; font-size : 12px; letter-spacing : 1px; @@ -43,7 +43,7 @@ A:hover { } input, textarea, select, option { - color : #FFFFFF; + color : #ffffff; background-color : #0571cc; border-color : #69b2ff; text-decoration : none; @@ -62,29 +62,29 @@ pre { .form_reset { border-style : groove; - border : solid 1px #FFFFFF; - color : #FFFFFF; + border : solid 1px #ffffff; + color : #ffffff; } .form_submit { - color : #FFFFFF; - border-color : #FFFFFF; + color : #ffffff; + border-color : #ffffff; } .form_delete { border-style : groove; - color : #FFFFFF; - border-color : #FFFFFF; + color : #ffffff; + border-color : #ffffff; } .runtime { - color : #FFFFFF; + color : #ffffff; background-color : #0571cc; font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .runtime.fatal { - color : #FFFFFF; + color : #ffffff; } .runtime.fatalcontent { @@ -92,13 +92,13 @@ pre { } .admin { - color : #FFFFFF; + color : #ffffff; background-color : #0571cc; font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .notice { - color : #FFFFFF; + color : #ffffff; font-size : 12px; } @@ -119,20 +119,20 @@ pre { .form_select { border : solid 1px; - border-color : #FFFFFF; + border-color : #ffffff; background-color : #69b2ff; } .admin.register { background-color : #69b2ff; - color : #FFFFFF; + color : #ffffff; text-align : center; align : center; } .table_header, .bug_table_header { background-color: #69b2ff; - color: #FFFFFF; + color: #ffffff; text-align: center; align: center; height: 25px; @@ -141,16 +141,29 @@ pre { padding-top: 5px; } +.header_column { + height: 23px; + background-color: #69b2ff; + color: #ffffff; + text-align: center; +} + +.footer_column { + height: 23px; + background-color: #69b2ff; + color: #ffffff; +} + .admin_menu { background-color : #69b2ff; - color : #FFFFFF; + color : #ffffff; width : 230px; text-align : left; } .logout_box { - background-color : #DDDDFF; - color : #FFFFFF; + background-color : #ddddFF; + color : #ffffff; } .description_text, .table, .table2, .table3 { @@ -172,14 +185,14 @@ pre { .member_data { background-color : #0571cc; - color : #FFFFFF; + color : #ffffff; height : 20px; } .form_field { border-style : solid; border : solid 1px; - border-color : #FFFFFF; + border-color : #ffffff; background-color : #69b2ff; } @@ -204,7 +217,7 @@ pre { } .guest_login_header { - color : #FFFFFF; + color : #ffffff; vertical-align : middle; background-color : #69b2ff; } @@ -330,7 +343,7 @@ pre { .dashed { border : solid 1px; - border-color : #FFFFFF; + border-color : #ffffff; } .switch_sw1 { @@ -357,7 +370,7 @@ pre { background-color : #69b2ff; align : center; text-align : center; - color : #FFFFFF; + color : #ffffff; height : 26px; font-weight : bold; font-size : 20px; @@ -369,7 +382,7 @@ pre { } .media_right { - color : #FFFFFF; + color : #ffffff; font-weight : bold; font-size : 14px; width : 70px; @@ -397,7 +410,7 @@ pre { .admin_task_header { background-color : #69b2ff; - color : #FFFFFF; + color : #ffffff; vertical-align : middle; font-size : 18px; height : 35px; @@ -413,8 +426,8 @@ pre { .form_delete, .form_delete { border-style : groove; - border : solid 1px #FFFFFF; - background-color : #FFFFFF; + border : solid 1px #ffffff; + background-color : #ffffff; color : #0571cc; } @@ -433,7 +446,7 @@ pre { } .guest_stats_r, .guest_stats_lr, .guest_stats_rr { - color : #FFFFFF; + color : #ffffff; width : 28px; font-weight : bold; text-align : center; @@ -469,15 +482,15 @@ pre { .medium { font-size : 14px; } .big { font-size : 20px; } -.top { border-top : 1px solid #FFFFFF; } -.bottom { border-bottom : 1px solid #FFFFFF; } -.left { border-left : 1px solid #FFFFFF; } -.right { border-right : 1px solid #FFFFFF; } +.top { border-top : 1px solid #ffffff; } +.bottom { border-bottom : 1px solid #ffffff; } +.left { border-left : 1px solid #ffffff; } +.right { border-right : 1px solid #ffffff; } -.top2 { border-top : 1px solid #FFFFFF; } -.bottom2 { border-bottom : 1px solid #FFFFFF; } -.left2 { border-left : 1px solid #FFFFFF; } -.right2 { border-right : 1px solid #FFFFFF; } +.top2 { border-top : 1px solid #ffffff; } +.bottom2 { border-bottom : 1px solid #ffffff; } +.left2 { border-left : 1px solid #ffffff; } +.right2 { border-right : 1px solid #ffffff; } .nobr { white-space : nowrap; @@ -500,13 +513,13 @@ pre { .mini_select { border: solid 1px; - border-color: #FFFFFF; + border-color: #ffffff; background-color: #69b2ff; font-size : 10px; } .theme_box { - border: 1px solid #FFFFFF; + border: 1px solid #ffffff; border-top: 0px; width: 100%; height: 70px; @@ -519,7 +532,7 @@ pre { } .theme_content { - color: #FFFFFF; + color: #ffffff; } .guest, .member { diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css index f5aff0ff16..c41b1729dc 100644 --- a/theme/ship-simu/css/general.css +++ b/theme/ship-simu/css/general.css @@ -129,12 +129,25 @@ pre { .table_header, .bug_table_header { background-color : #EEEEFF; - color : #000000; - text-align : center; - align : center; + color : #000000; + text-align : center; + align : center; font-size : 14px; - padding-bottom: 5px; - padding-top: 5px; + padding-bottom : 5px; + padding-top : 5px; +} + +.header_column { + height: 23px; + background-color: #eeeeff; + color: #000000; + text-align: center; +} + +.footer_column { + height: 23px; + background-color: #eeeeff; + color: #000000; } .admin_menu {
+ {--ADMIN_EDIT_THEME_TITLE--} +
{--ID_SELECT--} {--THEME_UNIX--}