From 124d4b3bc1bd76ddb10a8dd83d5055af041f51eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 11 Aug 2011 18:39:49 +0000 Subject: [PATCH] Extension ext-forced/network continued: - README.txt added for how you have to name your design (folder/directory name only). Don't forget to set the real (displayed) name in theme.php. - Extension ext-forced continued: Template for editing forced-ads added - Some language ids in ext-network renamed --- .gitattributes | 3 ++ inc/language/forced_de.php | 23 ++++++-- inc/language/network_de.php | 4 +- inc/libs/forced_functions.php | 30 +++++++++-- .../de/html/admin/admin_delete_networks.tpl | 2 +- .../de/html/admin/admin_edit_forced_ads.tpl | 18 +++++++ .../html/admin/admin_edit_forced_ads_row.tpl | 52 +++++++++++++++++++ .../de/html/admin/admin_edit_networks.tpl | 2 +- .../html/admin/admin_list_forced_ads_row.tpl | 2 +- .../select/select_forced_ads_type_option.tpl | 2 +- theme/README.txt | 5 ++ 11 files changed, 129 insertions(+), 14 deletions(-) create mode 100644 templates/de/html/admin/admin_edit_forced_ads.tpl create mode 100644 templates/de/html/admin/admin_edit_forced_ads_row.tpl create mode 100644 theme/README.txt diff --git a/.gitattributes b/.gitattributes index df6f01f0e2..81026ee248 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1196,6 +1196,8 @@ templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_email_max_rec_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_email_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_email_select.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_forced_ads.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_forced_ads_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_guest_menu.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_guest_menu_form.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_guest_menu_row.tpl svneol=native#text/plain @@ -1951,6 +1953,7 @@ templates/en/html/register_header.tpl svneol=native#text/plain templates/en/html/welcome.tpl svneol=native#text/plain templates/xml/.htaccess svneol=native#text/plain templates/xml/admin/.htaccess svneol=native#text/plain +theme/README.txt svneol=native#text/plain theme/business/images/code_bg.jpg -text svneol=unset#image/jpeg theme/business/images/code_bg.png -text svneol=unset#image/png theme/business/theme.php svneol=native#text/plain diff --git a/inc/language/forced_de.php b/inc/language/forced_de.php index ad1aafbf11..dea261aa66 100644 --- a/inc/language/forced_de.php +++ b/inc/language/forced_de.php @@ -57,16 +57,25 @@ addMessages(array( 'ADMIN_ENTER_FORCED_ALTERNATE_TEXT' => "Alternativen Text/Titel des Forced-Werbemittels eingeben:", 'ADMIN_ENTER_FORCED_AD_WIDTH' => "Breite (in Pixel) des Forced-Werbemittels eingeben:", 'ADMIN_ENTER_FORCED_AD_HEIGHT' => "Höhe (in Pixel) des Forced-Werbemittels eingeben:", - 'ADMIN_FORCED_AD_TYPE_UNKNOWN' => "Unbekanntes Forced-Werbemittel %s erkannt.", - 'ADMIN_FORCED_AD_TYPE_BANNER' => "Forced-Banner", - 'ADMIN_FORCED_AD_TYPE_TEXTLINK' => "Forced-Textlink", - 'ADMIN_FORCED_AD_TYPE_POPUP' => "Forced-PopUp", + 'ADMIN_FORCED_ADS_TYPE_UNKNOWN' => "Unbekanntes Forced-Werbemittel %s erkannt.", + 'ADMIN_FORCED_ADS_TYPE_BANNER' => "Forced-Banner", + 'ADMIN_FORCED_ADS_TYPE_TEXTLINK' => "Forced-Textlink", + 'ADMIN_FORCED_ADS_TYPE_POPUP' => "Forced-PopUp", 'ADMIN_LIST_FORCED_ADS_TITLE' => "Auflisten aller Forced-Werbemittel", 'ADMIN_FORCED_ADS_TYPE' => "Forced-Werbemittel", 'ADMIN_FORCED_ADS_VIEWS_COUNTER' => "Anzahl Forced-Views", 'ADMIN_FORCED_ADS_CLICKS_COUNTER' => "Anzahl Forced-Klicks", 'ADMIN_FORCED_ADS_HAS_FRAMEBREAKER' => "Framekiller?", - 'ADMIN_FORCED_ADS_ADDED' => "Hinzugefügt", + 'ADMIN_FORCED_ADS_ADDED' => "Hinzugefügt:", + 'ADMIN_CHANGE_FORCED_ADS_AD_URL' => "Banner-URL ändern:", + 'ADMIN_CHANGE_FORCED_ADS_CLICK_URL' => "Klick-URL ändern:", + 'ADMIN_CHANGE_FORCED_ADS_ALT_TEXT' => "Alternativen Text ändern:", + 'ADMIN_CHANGE_FORCED_ADS_WIDTH' => "Breite ändern:", + 'ADMIN_CHANGE_FORCED_ADS_HEIGHT' => "Höhe ändern:", + 'ADMIN_CHANGE_FORCED_ADS_USERID' => "Zugewiesenes Mitglied ändern:", + 'ADMIN_CHANGE_FORCED_ADS_TYPE' => "Art ändern:", + 'ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER' => "Ändern ob ein Framekiller vorhanden ist:", + 'ADMIN_EDIT_FORCED_ADS_TITLE' => "Ändern von Forced-Werbemitteln:", // Admin - forced campaigns 'ADMIN_FORCED_CAMPAIGNS_404' => "Es wurde keine Forced-Kampagnen gefunden.", @@ -76,6 +85,10 @@ addMessages(array( // Earning names 'EARNING_PROVIDER_FORCED_POPUP' => "Forced-PopUp", + + // Submit buttons + 'ADMIN_FORCED_ADS_CHANGE_SUBMIT' => "Forced-Werbemittel ändern", + )); // [EOF] diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 089a0d62a1..0363cce41d 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -68,8 +68,8 @@ addMessages(array( 'ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED' => "Eine Array-Element-Übersetzung %s existiert bereits.", // - Form titles 'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzufügen - Allgemeine Daten", - 'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten", - 'ADMIN_NETWORK_DELETE_TITLE' => "Werbenetzwerk löschen - Allgemeine Daten", + 'ADMIN_EDIT_NETWORK_DATA_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten", + 'ADMIN_DELETE_NETWORK_DATA_TITLE' => "Werbenetzwerk löschen - Allgemeine Daten", 'ADMIN_NETWORK_SELECT_TITLE' => "Bitte wählen Sie ein Werbenetzwerk aus", 'ADMIN_NETWORK_TYPE_SELECT_TITLE' => "Bitte wählen Sie einen Werbeart-Handler aus", 'ADMIN_NETWORK_TYPES_ADD_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzufügen", diff --git a/inc/libs/forced_functions.php b/inc/libs/forced_functions.php index b45c69edae..011621f52e 100644 --- a/inc/libs/forced_functions.php +++ b/inc/libs/forced_functions.php @@ -53,7 +53,7 @@ function doTemplateForcedAdTypeSelectionBox ($templateName, $clear = false, $def } // Translate the status IN/OUT -function translateForcedAdType ($status) { +function translateForcedAdsType ($status) { // Is the status null or empty? if (is_null($status)) { // Is NULL @@ -64,10 +64,10 @@ function translateForcedAdType ($status) { } // END - if // Default status is unknown - $return = '{%message,ADMIN_FORCED_AD_TYPE_UNKNOWN=' . $status . '%}'; + $return = '{%message,ADMIN_FORCED_ADS_TYPE_UNKNOWN=' . $status . '%}'; // Construct message id - $messageId = 'ADMIN_FORCED_AD_TYPE_' . $status; + $messageId = 'ADMIN_FORCED_ADS_TYPE_' . $status; // Is it there? if (isMessageIdValid($messageId)) { @@ -84,5 +84,29 @@ function getForcedPopupDataByEarningArray ($content) { debug_report_bug(__FUNCTION__, __LINE__, 'content=' . print_r($content, true)); } +// Generator (somewhat getter) for network type options +function generateForcedAdsTypeOptions ($type = NULL) { + // Is this cached? + if (!isset($GLOBALS[__FUNCTION__][$type])) { + // Generate output and cache it + $GLOBALS[__FUNCTION__][$type] = generateOptionList( + '/ARRAY/', + array( + 'BANNER', + 'TEXTLINK', + 'POPUP', + ), + array(), + $type, + '', '', + array(), + 'translateForcedAdsType' + ); + } // END - if + + // Return content + return $GLOBALS[__FUNCTION__][$type]; +} + // [EOF] ?> diff --git a/templates/de/html/admin/admin_delete_networks.tpl b/templates/de/html/admin/admin_delete_networks.tpl index f3a67cceed..b46097a157 100644 --- a/templates/de/html/admin/admin_delete_networks.tpl +++ b/templates/de/html/admin/admin_delete_networks.tpl @@ -3,7 +3,7 @@ $content diff --git a/templates/de/html/admin/admin_edit_forced_ads.tpl b/templates/de/html/admin/admin_edit_forced_ads.tpl new file mode 100644 index 0000000000..ecfedb40f4 --- /dev/null +++ b/templates/de/html/admin/admin_edit_forced_ads.tpl @@ -0,0 +1,18 @@ +
+
+
- {--ADMIN_NETWORK_DELETE_TITLE--} + {--ADMIN_DELETE_NETWORK_DATA_TITLE--}
+ + + + $content + + + +
+ {--ADMIN_EDIT_FORCED_ADS_TITLE--} +
+ + +
+ + diff --git a/templates/de/html/admin/admin_edit_forced_ads_row.tpl b/templates/de/html/admin/admin_edit_forced_ads_row.tpl new file mode 100644 index 0000000000..e4bf746f5b --- /dev/null +++ b/templates/de/html/admin/admin_edit_forced_ads_row.tpl @@ -0,0 +1,52 @@ + + + {--ADMIN_FORCED_ADS_ADDED--}
+ + $content[forced_ads_added] + + + {--ADMIN_CHANGE_FORCED_ADS_AD_URL--}
+ + + + + + {--ADMIN_CHANGE_FORCED_ADS_ALT_TEXT--}
+ + + + {--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}
+ + + + + + {--ADMIN_CHANGE_FORCED_ADS_WIDTH--}
+ + + + {--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}
+ + + + + + {--ADMIN_CHANGE_FORCED_ADS_USERID--}
+ $content[forced_ads_userid] + + + {--ADMIN_CHANGE_FORCED_ADS_TYPE--}
+ + + + + + {--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}
+ + +   + diff --git a/templates/de/html/admin/admin_edit_networks.tpl b/templates/de/html/admin/admin_edit_networks.tpl index ed0dc02d26..911012552b 100644 --- a/templates/de/html/admin/admin_edit_networks.tpl +++ b/templates/de/html/admin/admin_edit_networks.tpl @@ -3,7 +3,7 @@ $content diff --git a/templates/de/html/admin/admin_list_forced_ads_row.tpl b/templates/de/html/admin/admin_list_forced_ads_row.tpl index 8eaf69c971..07679af84c 100644 --- a/templates/de/html/admin/admin_list_forced_ads_row.tpl +++ b/templates/de/html/admin/admin_list_forced_ads_row.tpl @@ -9,7 +9,7 @@ {--ADMIN_TEST_URL--}
- {--ADMIN_NETWORK_EDIT_TITLE--} + {--ADMIN_EDIT_NETWORK_DATA_TITLE--}
- {%pipe,translateForcedAdType=$content[forced_ads_type]%} + {%pipe,translateForcedAdsType=$content[forced_ads_type]%} {%pipe,translateYesNo=$content[forced_ads_framebreaker]%} diff --git a/templates/de/html/select/select_forced_ads_type_option.tpl b/templates/de/html/select/select_forced_ads_type_option.tpl index a49aa0fae7..0e364f5ff1 100644 --- a/templates/de/html/select/select_forced_ads_type_option.tpl +++ b/templates/de/html/select/select_forced_ads_type_option.tpl @@ -1,3 +1,3 @@ diff --git a/theme/README.txt b/theme/README.txt new file mode 100644 index 0000000000..b27ff83d5c --- /dev/null +++ b/theme/README.txt @@ -0,0 +1,5 @@ +Please read these notes before creating your own design: +-------------------------------------------------------- + +Design names all lower-case, a-z, numbers, dash and underscore. Spaces in the +name are not spported. -- 2.39.2