| 1 | diff -ur -X excluir wifidog-auth/wifidog/classes/Content/BannerAdGroup/BannerAdGroup.php wifidog-auth.1318/wifidog/classes/Content/BannerAdGroup/BannerAdGroup.php |
|---|
| 2 | --- wifidog-auth/wifidog/classes/Content/BannerAdGroup/BannerAdGroup.php 2007-09-04 01:15:52.000000000 -0300 |
|---|
| 3 | +++ wifidog-auth.1318/wifidog/classes/Content/BannerAdGroup/BannerAdGroup.php 2008-01-06 18:46:20.000000000 -0200 |
|---|
| 4 | @@ -134,7 +134,7 @@ |
|---|
| 5 | |
|---|
| 6 | /*max_width*/ |
|---|
| 7 | $html .= "<li class='admin_element_item_container'>\n"; |
|---|
| 8 | - $html .= "<div class='admin_element_label'>" . ("Width") . ": </div>\n"; |
|---|
| 9 | + $html .= "<div class='admin_element_label'>" . _("Width") . ": </div>\n"; |
|---|
| 10 | $html .= "<div class='admin_element_data'>\n"; |
|---|
| 11 | $name = "banner_add_group_{this->getId()}_max_width"; |
|---|
| 12 | $html .= "<input type='text' size='6' value='$max_width' name='$name'>\n"; |
|---|
| 13 | @@ -143,7 +143,7 @@ |
|---|
| 14 | |
|---|
| 15 | /*max_height*/ |
|---|
| 16 | $html .= "<li class='admin_element_item_container'>\n"; |
|---|
| 17 | - $html .= "<div class='admin_element_label'>" . ("Height") . ": </div>\n"; |
|---|
| 18 | + $html .= "<div class='admin_element_label'>" . _("Height") . ": </div>\n"; |
|---|
| 19 | $html .= "<div class='admin_element_data'>\n"; |
|---|
| 20 | $name = "banner_add_group_{this->getId()}_max_height"; |
|---|
| 21 | $html .= "<input type='text' size='6' value='$max_height' name='$name'>\n"; |
|---|
| 22 | @@ -206,4 +206,4 @@ |
|---|
| 23 | * c-basic-offset: 4 |
|---|
| 24 | * c-hanging-comment-ender-p: nil |
|---|
| 25 | * End: |
|---|
| 26 | - */ |
|---|
| 27 | \ No newline at end of file |
|---|
| 28 | + */ |
|---|
| 29 | diff -ur -X excluir wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroup.php wifidog-auth.1318/wifidog/classes/Content/ContentGroup/ContentGroup.php |
|---|
| 30 | --- wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroup.php 2008-01-06 20:53:41.000000000 -0200 |
|---|
| 31 | +++ wifidog-auth.1318/wifidog/classes/Content/ContentGroup/ContentGroup.php 2008-01-09 16:00:19.000000000 -0200 |
|---|
| 32 | @@ -166,6 +166,7 @@ |
|---|
| 33 | * @return true if successfull |
|---|
| 34 | * */ |
|---|
| 35 | protected function setContentChangesOnMode($content_changes_on_mode, & $errormsg = null) { |
|---|
| 36 | + |
|---|
| 37 | $retval = false; |
|---|
| 38 | if (isset ($this->CONTENT_CHANGES_ON_MODES[$content_changes_on_mode]) && $content_changes_on_mode != $this->getContentChangesOnMode()) /* Only update database if the mode is valid and there is an actual change */ { |
|---|
| 39 | $db = AbstractDb :: getObject(); |
|---|
| 40 | @@ -255,6 +256,25 @@ |
|---|
| 41 | } |
|---|
| 42 | |
|---|
| 43 | public function getAdminUI($subclass_admin_interface = null, $title = null) { |
|---|
| 44 | + |
|---|
| 45 | + $this->CONTENT_ORDERING_MODES = array ( |
|---|
| 46 | + 'RANDOM' => _("Pick content elements randomly"), |
|---|
| 47 | + 'PSEUDO_RANDOM' => _("Pick content elements randomly, but not twice until all elements have been seen"), |
|---|
| 48 | + 'SEQUENTIAL' => _("Pick content elements in sequential order") |
|---|
| 49 | + ); |
|---|
| 50 | + $this->CONTENT_CHANGES_ON_MODES = array ( |
|---|
| 51 | + 'ALWAYS' => _("Content always rotates"), |
|---|
| 52 | + 'NEXT_DAY' => _("Content rotates once per day"), |
|---|
| 53 | + 'NEXT_LOGIN' => _("Content rotates once per session"), |
|---|
| 54 | + 'NEXT_NODE' => _("Content rotates each time you change node"), |
|---|
| 55 | + 'NEVER' => _("Content never rotates. Usefull when showing all elements simultaneously in a specific order.") |
|---|
| 56 | + ); |
|---|
| 57 | + $this->ALLOW_REPEAT_MODES = array ( |
|---|
| 58 | + 'YES' => _("Content can be shown more than once"), |
|---|
| 59 | + 'NO' => _("Content can only be shown once"), |
|---|
| 60 | + 'ONCE_PER_NODE' => _("Content can be shown more than once, but not at the same node") |
|---|
| 61 | + ); |
|---|
| 62 | + |
|---|
| 63 | $html = ''; |
|---|
| 64 | $html .= "<fieldset class='admin_element_group'>\n"; |
|---|
| 65 | $html .= "<legend>" . sprintf(_("%s configuration"), get_class($this)) . "</legend>\n"; |
|---|
| 66 | @@ -288,7 +308,7 @@ |
|---|
| 67 | |
|---|
| 68 | /*display_num_elements*/ |
|---|
| 69 | $html .= "<li class='admin_element_item_container'>\n"; |
|---|
| 70 | - $html .= "<div class='admin_element_label'>" . ("Pick how many elements for each display?") . ": </div>\n"; |
|---|
| 71 | + $html .= "<div class='admin_element_label'>" . _("Pick how many elements for each display?") . ": </div>\n"; |
|---|
| 72 | $html .= "<div class='admin_element_data'>\n"; |
|---|
| 73 | $name = "content_group_" . $this->id . "_display_num_elements"; |
|---|
| 74 | $value = $this->getDisplayNumElements(); |
|---|
| 75 | @@ -710,4 +730,4 @@ |
|---|
| 76 | * c-basic-offset: 4 |
|---|
| 77 | * c-hanging-comment-ender-p: nil |
|---|
| 78 | * End: |
|---|
| 79 | - */ |
|---|
| 80 | \ No newline at end of file |
|---|
| 81 | + */ |
|---|