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

diff --git a/.gitattributes b/.gitattributes
index df6f01f0e29655681a316885c31f98b2c03315b7..81026ee248245d678e0ec5e9d8426ff3c0740260 100644 (file)
--- 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 ad1aafbf11f75f8d1822698a39ac41dd402f4ec7..dea261aa664dfc7aeba2ca161085c65baaa3b891 100644 (file)
--- 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 089a0d62a13d7b040ba688c03f9d0c1b3c8ce5cc..0363cce41de824075414878c45fab4969d8186ad 100644 (file)
--- 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-&Uuml;bersetzung <span class=\"data\">%s</span> existiert bereits.",
        // - Form titles
        'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzuf&uuml;gen - Allgemeine Daten",
-       'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten",
-       'ADMIN_NETWORK_DELETE_TITLE' => "Werbenetzwerk l&ouml;schen - Allgemeine Daten",
+       'ADMIN_EDIT_NETWORK_DATA_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten",
+       'ADMIN_DELETE_NETWORK_DATA_TITLE' => "Werbenetzwerk l&ouml;schen - Allgemeine Daten",
        'ADMIN_NETWORK_SELECT_TITLE' => "Bitte w&auml;hlen Sie ein Werbenetzwerk aus",
        'ADMIN_NETWORK_TYPE_SELECT_TITLE' => "Bitte w&auml;hlen Sie einen Werbeart-Handler aus",
        'ADMIN_NETWORK_TYPES_ADD_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzuf&uuml;gen",

diff --git a/inc/libs/forced_functions.php b/inc/libs/forced_functions.php
index b45c69edaeae0a58abeab8b9419f7b899c0fca1f..011621f52e97865d6ebebc6d097dd8f178eac662 100644 (file)
--- 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 f3a67cceedcf4c23a9a0c777b3a590ac4cc366ec..b46097a157db4dc17f790d56daca2a4819a881d5 100644 (file)
--- a/templates/de/html/admin/admin_delete_networks.tpl
+++ b/templates/de/html/admin/admin_delete_networks.tpl
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
-                       <strong>{--ADMIN_NETWORK_DELETE_TITLE--}</strong>
+                       <strong>{--ADMIN_DELETE_NETWORK_DATA_TITLE--}</strong>
                </td>
        </tr>
        $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 (file)
index 0000000..ecfedb4
--- /dev/null
+++ b/templates/de/html/admin/admin_edit_forced_ads.tpl
@@ -0,0 +1,18 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_ads&amp;do=edit_forced_ads%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td align="center" class="table_header bottom" height="25" colspan="4">
+                       <strong>{--ADMIN_EDIT_FORCED_ADS_TITLE--}</strong>
+               </td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="4" class="table_footer">
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" class="form_submit" name="do_edit" value="{--ADMIN_FORCED_ADS_CHANGE_SUBMIT--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>

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 (file)
index 0000000..e4bf746
--- /dev/null
+++ b/templates/de/html/admin/admin_edit_forced_ads_row.tpl
@@ -0,0 +1,52 @@
+<tr>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_FORCED_ADS_ADDED--}<br />
+               <input type="hidden" name="sel[$content[forced_ads_id]]" value="1" />
+               <strong>$content[forced_ads_added]</strong>
+       </td>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_AD_URL--}<br />
+               <input type="text" class="form_field" name="forced_ads_ad_url[$content[forced_ads_id]]" size="20" maxlength="255" value="$content[forced_ads_ad_url]" />
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_ALT_TEXT--}<br />
+               <input type="text" class="form_field" name="forced_ads_alt_text[$content[forced_ads_id]]" size="15" maxlength="255" value="$content[forced_ads_alt_text]" />
+       </td>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--}<br />
+               <input type="text" class="form_field" name="forced_ads_click_url[$content[forced_ads_id]]" size="30" maxlength="255" value="$content[forced_ads_click_url]" />
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_WIDTH--}<br />
+               <input type="text" class="form_field" name="forced_ads_width[$content[forced_ads_id]]" size="4" maxlength="4" value="$content[forced_ads_width]" />
+       </td>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_HEIGHT--}<br />
+               <input type="text" class="form_field" name="forced_ads_height[$content[forced_ads_id]]" size="4" maxlength="4" value="$content[forced_ads_height]" />
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_USERID--}<br />
+               $content[forced_ads_userid]
+       </td>
+       <td class="{%template,ColorSwitch%}">
+               {--ADMIN_CHANGE_FORCED_ADS_TYPE--}<br />
+               <select name="forced_ads_type[$content[forced_ads_id]]" class="form_select" size="1">
+                       {%pipe,generateForcedAdsTypeOptions=$content[forced_ads_type]%}
+               </select>
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%} bottom">
+               {--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--}<br />
+               <select name="forced_ads_framebreaker[$content[forced_ads_id]]" class="form_select" size="1">
+                       {%pipe,generateYesNoOptionList=$content[forced_ads_framebreaker]%}
+               </select>
+       </td>
+       <td class="{%template,ColorSwitch%} bottom seperator">&nbsp;</td>
+</tr>

diff --git a/templates/de/html/admin/admin_edit_networks.tpl b/templates/de/html/admin/admin_edit_networks.tpl
index ed0dc02d26d70b618b13cd33f8579ac89b954c63..911012552b1cb855b3fd7471067fdfa1d1511b6d 100644 (file)
--- a/templates/de/html/admin/admin_edit_networks.tpl
+++ b/templates/de/html/admin/admin_edit_networks.tpl
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
-                       <strong>{--ADMIN_NETWORK_EDIT_TITLE--}</strong>
+                       <strong>{--ADMIN_EDIT_NETWORK_DATA_TITLE--}</strong>
                </td>
        </tr>
        $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 8eaf69c971653680ed190945242d903b75cba4ed..07679af84c7fb0325c370fea6157317c40dbb619 100644 (file)
--- 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 @@
                <a href="{%pipe,generateFrametesterUrl=$content[forced_ads_click_url]%}" target="_blank" title="{--ADMIN_TEST_URL--} - $content[forced_ads_alt_text]">{--ADMIN_TEST_URL--}</a>
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               {%pipe,translateForcedAdType=$content[forced_ads_type]%}
+               {%pipe,translateForcedAdsType=$content[forced_ads_type]%}
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                {%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 a49aa0fae7903327414958d48a3ef0ae27a2aaa7..0e364f5ff1611c4068c3ea87f603238f0679985d 100644 (file)
--- 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 @@
 <option value="$content[type]">
-       {%pipe,translateForcedAdType=$content[type]%}
+       {%pipe,translateForcedAdsType=$content[type]%}
 </option>

diff --git a/theme/README.txt b/theme/README.txt
new file mode 100644 (file)
index 0000000..b27ff83
--- /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.