Attached Files |
missing_id_on_popup_open_core.patch [^] (13,295 bytes) 2012-09-14 08:06
[Show Content]
Index: admin_templates/ajax/popup_manager.tpl
===================================================================
--- admin_templates/ajax/popup_manager.tpl (revision 15437)
+++ admin_templates/ajax/popup_manager.tpl (working copy)
@@ -1 +0,0 @@
-<inp2:adm_GetPopupSize/>
\ No newline at end of file
Index: admin_templates/categories/images_edit.tpl
===================================================================
--- admin_templates/categories/images_edit.tpl (revision 15437)
+++ admin_templates/categories/images_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_include t="incs/image_blocks"/>
@@ -26,14 +28,14 @@
go_to_id('c-img', '<inp2:c-img_PrevId/>');
}
));
-
+
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('c-img', '<inp2:c-img_NextId/>');
}
));
-
+
a_toolbar.Render();
-
+
<inp2:m_if check="c-img_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: admin_templates/categories/related_searches_edit.tpl
===================================================================
--- admin_templates/categories/related_searches_edit.tpl (revision 15437)
+++ admin_templates/categories/related_searches_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="related_searches_edit"/>
@@ -23,14 +25,14 @@
go_to_id('c-search', '<inp2:c-search_PrevId/>');
}
));
-
+
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('c-search', '<inp2:c-search_NextId/>');
}
));
-
+
a_toolbar.Render();
-
+
<inp2:m_if check="c-search_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: admin_templates/categories/relations_edit.tpl
===================================================================
--- admin_templates/categories/relations_edit.tpl (revision 15437)
+++ admin_templates/categories/relations_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="relations_edit"/>
@@ -34,7 +36,7 @@
<inp2:m_if check="c-rel_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
- a_toolbar.HideButton('sep1');
+ a_toolbar.HideButton('sep1');
<inp2:m_else/>
<inp2:m_if check="c-rel_IsLast" >
a_toolbar.DisableButton('next');
Index: admin_templates/config/config_search_edit.tpl
===================================================================
--- admin_templates/config/config_search_edit.tpl (revision 15437)
+++ admin_templates/config/config_search_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_Get name="section" result_to_var="section"/>
Index: admin_templates/head.tpl
===================================================================
--- admin_templates/head.tpl (revision 15437)
+++ admin_templates/head.tpl (working copy)
@@ -5,7 +5,7 @@
<inp2:m_Set skip_last_template="1"/>
<script type="text/javascript">
- $popup_manager = new AjaxPopupManager('<inp2:m_t t="ajax/popup_manager" pass="m" js_escape="1"/>');
+ $popup_manager = new AjaxPopupManager('<inp2:m_Link template="index" js_escape="1"/>');
grid_widths_cache = new Array();
</script>
Index: admin_templates/js/ajax.js
===================================================================
--- admin_templates/js/ajax.js (revision 15437)
+++ admin_templates/js/ajax.js (working copy)
@@ -318,44 +318,35 @@
// AJAX PopupManager class
function AjaxPopupManager($url) {
this.URL = $url;
- this.ResponceFunction = null;
- this.PopupSizes = new Array();
+ this.PopupSizes = [];
}
-AjaxPopupManager.prototype.GetSize = function ($template) {
- if (this.ResponceFunction == null) {
- alert ('Please define responce function first (type: '+typeof(this.ResponceFunction)+')');
+AjaxPopupManager.prototype.GetSize = function ($template, $callback) {
+ if ( $callback === undefined || !$.isFunction($callback) ) {
+ alert('Please specify callback');
}
- if (!isset(this.PopupSizes[$template])) {
- var $url = this.URL + '&type=GetPopupSize&template_name=' + $template;
-// alert('from ajax: '+$url);
- Request.makeRequest($url, this.BusyRequest, '', this.successCallback, this.errorCallback, ['GetSize', $template], this);
+ if ( !isset(this.PopupSizes[$template]) ) {
+ var $me = this;
+
+ $.get(
+ this.URL,
+ {
+ 'events[adm]': 'OnGetPopupSize',
+ 'template_name': $template
+ },
+ function ($popup_size) {
+ // store response to cache for future use
+ $me.PopupSizes[$template] = $popup_size;
+ $callback($popup_size);
+ }
+ );
}
else {
-// alert('from cache');
- this.ResponceFunction(this.PopupSizes[$template]);
+ $callback(this.PopupSizes[$template]);
}
-}
+};
-AjaxPopupManager.prototype.successCallback = function($request, $params, $object) {
- var $responce = $request.responseText;
-
- switch ($params[0]) {
- case 'GetSize':
- // store responce to cache for future use
- $object.PopupSizes[ $params[1] ] = $responce;
- break;
- }
-
- $object.ResponceFunction($responce);
- $object.ResponceFunction = null; // reset responce function
-}
-
-AjaxPopupManager.prototype.errorCallback = function($request, $params, $object) {
- alert('AJAX Error; class: AjaxPopupManager; ' + Request.getErrorHtml($request));
-}
-
// AJAX DropdownPreloader class
function AjaxDropdownPreloader($url, $input_mask, $filter_field, $dependend_field, value, $has_empty) {
this.URL = $url;
Index: admin_templates/js/script.js
===================================================================
--- admin_templates/js/script.js (revision 15437)
+++ admin_templates/js/script.js (working copy)
@@ -468,16 +468,15 @@
if ( $pm ) {
// popup manager was found in head frame
- $pm.ResponceFunction = function ($responce) {
- if ( !$responce.match(/([\d]+)x([\d]+)/) ) {
- // invalid responce was received, may be php fatal error during AJAX request
- $responce = $default_size;
+ $pm.GetSize($t, function ($response) {
+ if ( !$response.match(/([\d]+)x([\d]+)/) ) {
+ // invalid response was received, may be php fatal error during AJAX request
+ $response = $default_size;
}
- open_popup($prefix_special, $event, $t, $responce, $onAfterOpenPopup);
- }
+ open_popup($prefix_special, $event, $t, $response, $onAfterOpenPopup);
+ });
- $pm.GetSize($t);
return;
}
Index: admin_templates/users/admin_edit_group.tpl
===================================================================
--- admin_templates/users/admin_edit_group.tpl (revision 15437)
+++ admin_templates/users/admin_edit_group.tpl (working copy)
@@ -1,5 +1,6 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
-
<inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="user_edit_group"/>
<!-- ToolBar -->
Index: admin_templates/users/image_edit.tpl
===================================================================
--- admin_templates/users/image_edit.tpl (revision 15437)
+++ admin_templates/users/image_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_image_edit"/>
@@ -25,14 +27,14 @@
go_to_id('u-img', '<inp2:u-img_PrevId/>');
}
));
-
+
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('u-img', '<inp2:u-img_NextId/>');
}
));
-
+
a_toolbar.Render();
-
+
<inp2:m_if check="u-img_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: admin_templates/users/user_edit_group.tpl
===================================================================
--- admin_templates/users/user_edit_group.tpl (revision 15437)
+++ admin_templates/users/user_edit_group.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_group"/>
Index: units/admin/admin_events_handler.php
===================================================================
--- units/admin/admin_events_handler.php (revision 15437)
+++ units/admin/admin_events_handler.php (working copy)
@@ -1131,6 +1131,43 @@
$this->Conn->Query('OPTIMIZE TABLE ' . $table_name);
}
}
+
+ /**
+ * Returns popup size (by template), if not cached, then parse template to get value
+ *
+ * @param kEvent $event
+ * @return void
+ * @access protected
+ */
+ protected function OnGetPopupSize(kEvent $event)
+ {
+ $event->status = kEvent::erSTOP;
+
+ if ( $this->Application->GetVar('ajax') != 'yes' ) {
+ return;
+ }
+
+ $t = $this->Application->GetVar('template_name');
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'PopupSizes
+ WHERE TemplateName = ' . $this->Conn->qstr($t);
+ $popup_info = $this->Conn->GetRow($sql);
+
+ $this->Application->setContentType('text/plain');
+
+ if ( !$popup_info ) {
+ // dies when SetPopupSize tag found & in ajax request
+ $this->Application->InitParser();
+ $this->Application->ParseBlock(Array ('name' => $t));
+
+ // tag SetPopupSize not found in template -> use default size
+ echo '750x400';
+ }
+ else {
+ echo $popup_info['PopupWidth'] . 'x' . $popup_info['PopupHeight'];
+ }
+ }
}
Index: units/admin/admin_tag_processor.php
===================================================================
--- units/admin/admin_tag_processor.php (revision 15437)
+++ units/admin/admin_tag_processor.php (working copy)
@@ -654,64 +654,49 @@
* Allows to set popup size (key - current template name)
*
* @param Array $params
+ * @return string
+ * @access protected
*/
- function SetPopupSize($params)
+ protected function SetPopupSize($params)
{
$width = $params['width'];
$height = $params['height'];
- if ($this->Application->GetVar('ajax') == 'yes') {
+ if ( $this->Application->GetVar('ajax') == 'yes' ) {
// during AJAX request just output size
- die($width.'x'.$height);
+ die($width . 'x' . $height);
}
- if (!$this->UsePopups($params)) {
- return ;
+ if ( !$this->UsePopups($params) ) {
+ return;
}
$t = $this->Application->GetVar('t');
+
$sql = 'SELECT *
- FROM '.TABLE_PREFIX.'PopupSizes
- WHERE TemplateName = '.$this->Conn->qstr($t);
+ FROM ' . TABLE_PREFIX . 'PopupSizes
+ WHERE TemplateName = ' . $this->Conn->qstr($t);
$popup_info = $this->Conn->GetRow($sql);
- if (!$popup_info) {
+
+ if ( !$popup_info ) {
// create new popup size record
- $fields_hash = Array (
- 'TemplateName' => $t,
- 'PopupWidth' => $width,
- 'PopupHeight' => $height,
- );
- $this->Conn->doInsert($fields_hash, TABLE_PREFIX.'PopupSizes');
+ $fields_hash = Array (
+ 'TemplateName' => $t,
+ 'PopupWidth' => $width,
+ 'PopupHeight' => $height,
+ );
+
+ $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'PopupSizes');
}
- elseif ($popup_info['PopupWidth'] != $width || $popup_info['PopupHeight'] != $height) {
+ elseif ( $popup_info['PopupWidth'] != $width || $popup_info['PopupHeight'] != $height ) {
// popup found and size in tag differs from one in db -> update in db
- $fields_hash = Array (
- 'PopupWidth' => $width,
- 'PopupHeight' => $height,
- );
- $this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'PopupSizes', 'PopupId = '.$popup_info['PopupId']);
- }
- }
+ $fields_hash = Array (
+ 'PopupWidth' => $width,
+ 'PopupHeight' => $height,
+ );
- /**
- * Returns popup size (by template), if not cached, then parse template to get value
- *
- * @param Array $params
- * @return string
- */
- function GetPopupSize($params)
- {
- $t = $this->Application->GetVar('template_name');
- $sql = 'SELECT *
- FROM '.TABLE_PREFIX.'PopupSizes
- WHERE TemplateName = '.$this->Conn->qstr($t);
- $popup_info = $this->Conn->GetRow($sql);
- if (!$popup_info) {
- $this->Application->InitParser();
- $this->Application->ParseBlock(array('name' => $t)); // dies when SetPopupSize tag found & in ajax requrest
- return '750x400'; // tag SetPopupSize not found in template -> use default size
+ $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'PopupSizes', 'PopupId = ' . $popup_info['PopupId']);
}
- return $popup_info['PopupWidth'].'x'.$popup_info['PopupHeight'];
}
/**
missing_id_on_popup_open_modules.patch [^] (17,067 bytes) 2012-09-14 08:06
[Show Content]
Index: in-bulletin/admin_templates/topics/images_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/images_edit.tpl (revision 15437)
+++ in-bulletin/admin_templates/topics/images_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="bb" section="in-portal:browse" title_preset="images_edit"/>
@@ -32,7 +34,7 @@
));
a_toolbar.Render();
-
+
<inp2:m_if check="bb-img_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
@@ -44,7 +46,7 @@
<inp2:m_if check="bb-img_IsFirst">
a_toolbar.DisableButton('prev');
</inp2:m_if>
- </inp2:m_if>
+ </inp2:m_if>
</script>
</td>
</tr>
Index: in-bulletin/admin_templates/topics/relations_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/relations_edit.tpl (revision 15437)
+++ in-bulletin/admin_templates/topics/relations_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="bb" section="in-portal:browse" title_preset="relations_edit"/>
@@ -30,7 +32,7 @@
));
a_toolbar.Render();
-
+
<inp2:m_if check="bb-rel_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: in-bulletin/admin_templates/topics/review_edit.tpl
===================================================================
--- in-bulletin/admin_templates/topics/review_edit.tpl (revision 15437)
+++ in-bulletin/admin_templates/topics/review_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="bb" section="in-portal:browse" title_preset="reviews_edit"/>
Index: in-commerce/admin_templates/affiliate_plans/affiliate_edit_payments.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_edit_payments.tpl (revision 15437)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_edit_payments.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="affil" section="in-commerce:affiliates" title_preset="affiliate_payments" pagination="1" pagination_prefix="apayments" tab_preset="Default"/>
Index: in-commerce/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="apt" section="in-commerce:affiliate_payment_types" title_preset="affiliate_payment_types_edit"/>
Index: in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (revision 15437)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" title_preset="affiliate_plans_brackets" tab_preset="Default"/>
Index: in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" title_preset="affiliate_plans_edit" tab_preset="Default"/>
Index: in-commerce/admin_templates/affiliate_plans/affiliate_plans_items.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_plans_items.tpl (revision 15437)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_items.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_if check="api_IsEntireOrder">
Index: in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/affiliate_plans/affiliates_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="affil" section="in-commerce:affiliates" title_preset="affiliates_edit" tab_preset="Default"/>
Index: in-commerce/admin_templates/currencies/currencies_edit.tpl
===================================================================
--- in-commerce/admin_templates/currencies/currencies_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/currencies/currencies_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="curr" section="in-commerce:currencies" title_preset="currencies_edit"/>
Index: in-commerce/admin_templates/paid_listings/paid_listing_type_shopcart.tpl
===================================================================
--- in-commerce/admin_templates/paid_listings/paid_listing_type_shopcart.tpl (revision 15437)
+++ in-commerce/admin_templates/paid_listings/paid_listing_type_shopcart.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="790" height="440"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="lst" section="in-link:listing_types" title_preset="listing_type_shop_cart" tab_preset="Default"/>
Index: in-commerce/admin_templates/products/access_pricing_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/access_pricing_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/products/access_pricing_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="pricing_edit"/>
@@ -30,7 +32,7 @@
));
a_toolbar.Render();
-
+
<inp2:m_if check="pr_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
@@ -59,12 +61,12 @@
<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessDuration" title="la_fld_AccessDuration" size="4"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="pr" field="AccessUnit" title="la_fld_AccessDurationUnit" size="20"/>
- <!--## TODO check on implementation (came from customization healtheconomics.org)
+ <!--## TODO check on implementation (came from customization healtheconomics.org)
<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessRebillDate" title="la_fld_AccessRebillDate" size="5"/>
<inp2:m_RenderElement name="inp_edit_radio" prefix="pr" field="DurationType" title="la_fld_DurationType"/>
<inp2:m_RenderElement name="inp_edit_date" prefix="pr" field="AccessExpiration" title="la_fld_AccessExpiration"/>
## -->
-
+
<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Description" title="la_fld_Description" size="30"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="la_fld_Price" size="4"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="IsPrimary" title="la_fld_Primary"/>
Index: in-commerce/admin_templates/products/file_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/file_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/products/file_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="file_edit"/>
@@ -42,7 +44,7 @@
<inp2:m_if check="file_IsFirst">
a_toolbar.DisableButton('prev');
</inp2:m_if>
- </inp2:m_if>
+ </inp2:m_if>
</script>
</td>
</tr>
Index: in-commerce/admin_templates/products/images_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/images_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/products/images_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="images_edit"/>
@@ -36,7 +38,7 @@
<inp2:m_if check="img_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
- a_toolbar.HideButton('sep1');
+ a_toolbar.HideButton('sep1');
<inp2:m_else/>
<inp2:m_if check="img_IsLast" >
a_toolbar.DisableButton('next');
Index: in-commerce/admin_templates/products/pricing_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/pricing_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/products/pricing_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="pricing_edit"/>
Index: in-commerce/admin_templates/products/relations_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/relations_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/products/relations_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="relations_edit"/>
Index: in-commerce/admin_templates/products/review_edit.tpl
===================================================================
--- in-commerce/admin_templates/products/review_edit.tpl (revision 15437)
+++ in-commerce/admin_templates/products/review_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="reviews_edit"/>
Index: in-link/admin_templates/links/file_edit.tpl
===================================================================
--- in-link/admin_templates/links/file_edit.tpl (revision 15437)
+++ in-link/admin_templates/links/file_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="file_edit"/>
Index: in-link/admin_templates/links/images_edit.tpl
===================================================================
--- in-link/admin_templates/links/images_edit.tpl (revision 15437)
+++ in-link/admin_templates/links/images_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="images_edit"/>
@@ -25,14 +27,14 @@
go_to_id('l-img', '<inp2:l-img_PrevId/>');
}
));
-
+
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('l-img', '<inp2:l-img_NextId/>');
}
));
-
+
a_toolbar.Render();
-
+
<inp2:m_if check="l-img_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: in-link/admin_templates/links/relations_edit.tpl
===================================================================
--- in-link/admin_templates/links/relations_edit.tpl (revision 15437)
+++ in-link/admin_templates/links/relations_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="relations_edit"/>
@@ -30,7 +32,7 @@
));
a_toolbar.Render();
-
+
<inp2:m_if check="l-rel_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: in-link/admin_templates/links/review_edit.tpl
===================================================================
--- in-link/admin_templates/links/review_edit.tpl (revision 15437)
+++ in-link/admin_templates/links/review_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="l" section="in-portal:browse" title_preset="reviews_edit"/>
Index: in-link/admin_templates/paid_listings/paid_listing_edit.tpl
===================================================================
--- in-link/admin_templates/paid_listings/paid_listing_edit.tpl (revision 15437)
+++ in-link/admin_templates/paid_listings/paid_listing_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="ls" section="in-link:paid_listings" title_preset="listing_edit"/>
Index: in-news/admin_templates/articles/file_edit.tpl
===================================================================
--- in-news/admin_templates/articles/file_edit.tpl (revision 15437)
+++ in-news/admin_templates/articles/file_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="file_edit"/>
Index: in-news/admin_templates/articles/images_edit.tpl
===================================================================
--- in-news/admin_templates/articles/images_edit.tpl (revision 15437)
+++ in-news/admin_templates/articles/images_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="images_edit"/>
@@ -25,14 +27,14 @@
go_to_id('n-img', '<inp2:n-img_PrevId/>');
}
));
-
+
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('n-img', '<inp2:n-img_NextId/>');
}
));
-
+
a_toolbar.Render();
-
+
<inp2:m_if check="n-img_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: in-news/admin_templates/articles/relations_edit.tpl
===================================================================
--- in-news/admin_templates/articles/relations_edit.tpl (revision 15437)
+++ in-news/admin_templates/articles/relations_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="relations_edit"/>
@@ -30,7 +32,7 @@
));
a_toolbar.Render();
-
+
<inp2:m_if check="n-rel_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
Index: in-news/admin_templates/articles/review_edit.tpl
===================================================================
--- in-news/admin_templates/articles/review_edit.tpl (revision 15437)
+++ in-news/admin_templates/articles/review_edit.tpl (working copy)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="reviews_edit"/>
|