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 628fe539bda0090fedf917b5451e98add23826ad..6e8b5e7a9e23ef4734c25f8ce49e3b18164ac99c 100644 (file)
--- 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 58bdc921bfbdfb97e980ee22b762dd0f6c9d9bec..5f725ef053ed3b4afeef75585ce0b85e36a9b319 100644 (file)
--- 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&auml;hlte Mitglied <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> hat noch keinen Nicknamen angelegt. Daher konnten auch keine Historie-Eintr&auml;ge gefunden werden.",
        'ADMIN_LIST_NICKNAME_HISTORY_TITLE' => "Alle verwendeten Nicknames des Mitgliedes <span class=\"data\">{%get,generateUserProfileLink=userid%}</span>",
 
        // Member

diff --git a/inc/language/theme_de.php b/inc/language/theme_de.php
index cb0199e93447f67e76445e9e9f28fcaa7044b1ba..f8a6f1276b930eeabb3fb41c1875ab9fb67d723a 100644 (file)
--- a/inc/language/theme_de.php
+++ b/inc/language/theme_de.php
@@ -48,6 +48,9 @@ addMessages(array(
        'ADMIN_THEME_ALREADY_INSTALLED' => "Theme <span class=\"data\">%s</span> bereits installiert.",
        'ADMIN_THEME_NOTHING_FOUND' => "Keine Themes auf dem Server gefunden.",
        'ADMIN_THEME_INC_404' => "Wichtige Design-Headerdatei <u>theme.php</u> konnte zum Design <span class=\"data\">%s</span> nicht gefunden werden.",
+       'ADMIN_SET_AS_NEW_THEME' => "Dieses Theme als Standard-Theme setzen",
+       'ADMIN_EDIT_THEME_TITLE' => "Designs &auml;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 9ed9029b2232fc85bac0664a3fcda83bb3a737fb..ae2c3ff311dc06cd91ba1e872296c8ead7800063 100644 (file)
--- 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 1fee67237385bfa6ee43709e5540306dcef6fdae..d63738578527f5d71d30772d30ebfcb84373f719 100644 (file)
--- a/templates/de/html/admin/admin_edit_theme.tpl
+++ b/templates/de/html/admin/admin_edit_theme.tpl
@@ -1,6 +1,11 @@
 <div align="center">
 <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=theme_edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="6" class="table_header">
+                       {--ADMIN_EDIT_THEME_TITLE--}
+               </td>
+       </tr>
        <tr>
                <td class="header_column bottom right" align="center">{--ID_SELECT--}</td>
                <td class="header_column bottom right" align="center">{--THEME_UNIX--}</td>
@@ -21,7 +26,7 @@
 </form>
 
 <div class="notice">
-       {--ADMIN_THEME_NEW_DEFAULT_THEME--}
+       {--ADMIN_EDIT_THEME_NOTICE--}
 </div>
 
 </div>

diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl
index a3b18bcd88c6a84bc7c0960d9630a1150353c434..5ab0d215fd8edc27539555198770ad352806781c 100644 (file)
--- a/templates/de/html/admin/admin_footer.tpl
+++ b/templates/de/html/admin/admin_footer.tpl
@@ -2,6 +2,7 @@
        <div class="table dashed" style="width:400px;margin-bottom:5px">
        <ul style="padding:0px;margin:0px">
                <li class="menu_blur switch_sw2 bottom"><a href="{%url=modules.php?module=index%}" title="{--ADMIN_BACK_TO_GUEST_MENU--}">{--ADMIN_BACK_TO_GUEST_MENU--}</a></li>
+               <li class="menu_blur switch_sw1 bottom"><a href="http://mxchange.org" target="_blank" title="{--ADMIN_MAILER_HOME_LINK--}">{--ADMIN_MAILER_HOME_LINK--}</a></li>
                <li class="menu_blur switch_sw1 bottom"><a href="http://forum.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_FORUM_LINK--}">{--ADMIN_SUPPORT_FORUM_LINK--}</a></li>
                <li class="menu_blur switch_sw2 bottom"><a href="http://bugs.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_BUGTRACKER_LINK--}">{--ADMIN_SUPPORT_BUGTRACKER_LINK--}</a></li>
                <li class="menu_blur switch_sw1 bottom"><a href="http://wiki.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_WIKI_LINK--}">{--ADMIN_SUPPORT_WIKI_LINK--}</a></li>

diff --git a/theme/business/css/general.css b/theme/business/css/general.css
index 73f794f6687033e0347fa467f7ee23d62538952c..ef6be1c7504c954c0dd3f404373347d28824c080 100644 (file)
--- 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 1e30da0d3fcdf9814a4425265782dbf8ce91c915..c1a51b0be506fd9e199b4e13c9f75fa074f5013f 100644 (file)
--- 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 7a926aed3e09058f93de17a77514086e5354e722..d3bf0e0d315958da62e46e11a0cee18122fb589d 100644 (file)
--- 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 3dce90d3932e4ab193907076fb1e37236cac2735..d5d27ecb1ac9f91e46f7d66966f75ae043cd992c 100644 (file)
--- 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 f5aff0ff167e4bc57559535fe94f7620c9253f94..c41b1729dc4d69bce32e2471d98c663ddd0e2dac 100644 (file)
--- 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 {