[limb-svn] r6478 - in 3.x/trunk/limb/cms: shared/js template/_cms
svn at limb-project.com
svn at limb-project.com
Thu Nov 1 11:56:37 MSK 2007
Author: momental
Date: 2007-11-01 11:56:37 +0300 (Thu, 01 Nov 2007)
New Revision: 6478
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6478
Added:
3.x/trunk/limb/cms/shared/js/cp_common_controls.js
Modified:
3.x/trunk/limb/cms/shared/js/cp.js
3.x/trunk/limb/cms/template/_cms/js.html
3.x/trunk/limb/cms/template/_cms/page.html
Log:
-- some changes
Modified: 3.x/trunk/limb/cms/shared/js/cp.js
===================================================================
--- 3.x/trunk/limb/cms/shared/js/cp.js 2007-11-01 07:56:41 UTC (rev 6477)
+++ 3.x/trunk/limb/cms/shared/js/cp.js 2007-11-01 08:56:37 UTC (rev 6478)
@@ -2,128 +2,6 @@
var ShowFilterDefault = 'Показать фильтр';
var HideFilterDefault = 'Скрыть фильтр';
-function toggle_selected(toggle_obj)
-{
- var parent_form = toggle_obj.form;
- var mark = toggle_obj.checked;
-
- jQuery("input:checkbox[@name='ids[]']", parent_form).each(function(){
- jQuery(this).attr("checked", mark);
- });
-}
-
-
-Limb.Class('CMS.Filter',
-{
- __construct:function()
- {
- var filter = jQuery('.filter');
- var filterForm = jQuery('.filter form');
- var list = jQuery('.list');
-
- if (!filter.is('div'))
- return;
-
- var activeFilterHTML = '<a class="active_filter"><span>' + ShowFilterDefault + '</span></a>';
- var htmlText = '<div class="filter_bottom"><a class="active_filter_bottom"><span>' + ShowFilterDefault + '</span></a></div>';
-
- filter.prepend(activeFilterHTML);
- list.css('margin','0');
- list.after(htmlText);
- this._initBehavior();
-
- this.activeFilter = jQuery('.filter .active_filter span');
- this.activeFilterBelowList = jQuery('.filter_bottom .active_filter_bottom span');
-
- if(Limb.cookie(window.location + '.filter') == 1){
- filterForm.show();
- this.activeFilter.text(HideFilterDefault);
- this.activeFilter.addClass('show');
-
- }
- else {
- filterForm.hide();
- this.activeFilter.text(ShowFilterDefault);
- }
-
- },
-
- initActiveFilterClick: function()
- {
- var filterForm = jQuery('.filter form');
- var filterFormBelowList = jQuery('.filter_bottom form');
-
- if (filterFormBelowList.is('form')){
- filterFormBelowList.hide();
- filterFormBelowList.clone().appendTo(".filter").show('slow');
- filterFormBelowList.remove();
- }
- else
- filterForm.toggle('slow');
-
- this.setFilterCookie();
- this.initActiveFilter();
- },
-
- initActiveFilterBelowListClick:function()
- {
- var filterForm = jQuery('.filter form');
- var filterFormBelowList = jQuery('.filter_bottom form');
-
- if (filterFormBelowList.is('form'))
- filterFormBelowList.toggle('slow');
- else {
- filterForm.hide();
- filterForm.clone().prependTo(".filter_bottom").show('slow');
- filterForm.remove();
- }
-
- this.setFilterCookie();
- this.initActiveFilter();
-
- },
-
- initActiveFilter:function (){
- var filterForm = jQuery('.filter form');
-
- if (filterForm.is('form')){
-
- if (this.activeFilter.attr('class')== 'show')
- this.activeFilter.removeClass('show').text(ShowFilterDefault);
- else {
- this.activeFilter.addClass('show').text(HideFilterDefault);
- this.activeFilterBelowList.removeClass('show').text(ShowFilterDefault);
- }
- }
- else{
-
- if (this.activeFilterBelowList.attr('class')== 'show')
- this.activeFilterBelowList.removeClass('show').text(ShowFilterDefault);
- else {
- this.activeFilterBelowList.addClass('show').text(HideFilterDefault);
- this.activeFilter.removeClass('show').text(ShowFilterDefault);
- }
-
- }
- },
-
- setFilterCookie: function(){
-
- if(Limb.cookie(window.location + '.filter') == 1)
- Limb.cookie(window.location + '.filter', 0);
- else
- Limb.cookie(window.location + '.filter', 1);
- },
-
- _initBehavior: function(){
- jQuery('.active_filter').click(this.initActiveFilterClick.bind(this));
- jQuery('.active_filter_bottom').click(this.initActiveFilterBelowListClick.bind(this));
- }
-
-});
-
-
-
function control_error()
{
if(jQuery('.message_error .content ol').css('display')=='none')
@@ -132,7 +10,6 @@
jQuery('.message_error .content ol').slideUp('fast');
}
-
Limb.namespace('CMS.forms');
CMS.forms.upload_file = function(uri, field_id, on_complete)
@@ -304,6 +181,127 @@
}
});
+/////// LAYOUT POSTPROCESSING HELPERS
+
+/**
+ Filter formatting
+
+ обрабатывает форму фильтра поиска при выводе списков в панели управления
+ позволяет скрывать/показывать фильтр. при необходимости отображает форму поиска в конце списка.
+ запоминает состояние отображения (скрыт/доуступен) конкретного фильтра в cookies
+
+ TODO: продублировать описание на английском. показать пример использования.
+*/
+Limb.Class('CMS.Filter',
+{
+ __construct:function()
+ {
+ var filter = jQuery('.filter');
+ var filterForm = jQuery('.filter form');
+ var list = jQuery('.list');
+
+ if (!filter.is('div'))
+ return;
+
+ var activeFilterHTML = '<a class="active_filter"><span>' + ShowFilterDefault + '</span></a>';
+ var htmlText = '<div class="filter_bottom"><a class="active_filter_bottom"><span>' + ShowFilterDefault + '</span></a></div>';
+
+ filter.prepend(activeFilterHTML);
+ list.css('margin','0');
+ list.after(htmlText);
+ this._initBehavior();
+
+ this.activeFilter = jQuery('.filter .active_filter span');
+ this.activeFilterBelowList = jQuery('.filter_bottom .active_filter_bottom span');
+
+ if(Limb.cookie(window.location + '.filter') == 1){
+ filterForm.show();
+ this.activeFilter.text(HideFilterDefault);
+ this.activeFilter.addClass('show');
+
+ }
+ else {
+ filterForm.hide();
+ this.activeFilter.text(ShowFilterDefault);
+ }
+
+ },
+
+ initActiveFilterClick: function()
+ {
+ var filterForm = jQuery('.filter form');
+ var filterFormBelowList = jQuery('.filter_bottom form');
+
+ if (filterFormBelowList.is('form')){
+ filterFormBelowList.hide();
+ filterFormBelowList.clone().appendTo(".filter").show('fast');
+ filterFormBelowList.remove();
+ }
+ else
+ filterForm.toggle('slow');
+
+ this.setFilterCookie();
+ this.initActiveFilter();
+ },
+
+ initActiveFilterBelowListClick:function()
+ {
+ var filterForm = jQuery('.filter form');
+ var filterFormBelowList = jQuery('.filter_bottom form');
+
+ if (filterFormBelowList.is('form'))
+ filterFormBelowList.toggle('slow');
+ else {
+ filterForm.hide();
+ filterForm.clone().prependTo(".filter_bottom").show('slow');
+ filterForm.remove();
+ }
+
+ this.setFilterCookie();
+ this.initActiveFilter();
+
+ },
+
+ initActiveFilter:function (){
+ var filterForm = jQuery('.filter form');
+
+ if (filterForm.is('form')){
+
+ if (this.activeFilter.attr('class')== 'show')
+ this.activeFilter.removeClass('show').text(ShowFilterDefault);
+ else {
+ this.activeFilter.addClass('show').text(HideFilterDefault);
+ this.activeFilterBelowList.removeClass('show').text(ShowFilterDefault);
+ }
+ }
+ else{
+
+ if (this.activeFilterBelowList.attr('class')== 'show')
+ this.activeFilterBelowList.removeClass('show').text(ShowFilterDefault);
+ else {
+ this.activeFilterBelowList.addClass('show').text(HideFilterDefault);
+ this.activeFilter.removeClass('show').text(ShowFilterDefault);
+ }
+
+ }
+ },
+
+ setFilterCookie: function(){
+
+ if(Limb.cookie(window.location + '.filter') == 1)
+ Limb.cookie(window.location + '.filter', 0);
+ else
+ Limb.cookie(window.location + '.filter', 1);
+ },
+
+ _initBehavior: function(){
+ jQuery('.active_filter').click(this.initActiveFilterClick.bind(this));
+ jQuery('.active_filter_bottom').click(this.initActiveFilterBelowListClick.bind(this));
+ }
+
+});
+
+
function initImgResize(){
jQuery('img[@resize]')
.one('load', function()
@@ -453,12 +451,6 @@
};
-
-function changed_field_highlighter()
-{
- jQuery(this).change(function(){jQuery(this).prev('label').css({color: 'green'})});
-}
-
function initMainMenu(){
//left navigation current item highlight
var url = window.location.toString();
@@ -485,7 +477,7 @@
};
-/*WINDOW READY ==========================================*/
+/*============================== WINDOW READY ==============================*/
jQuery(window).ready(function(){
initDocumentStructure();
jQuery(window).resize(initDocumentStructure);
@@ -517,9 +509,4 @@
});
-Limb.namespace('rt.Util');
-rt.Util.clickAjax = function(link)
-{
- jQuery.ajax({type: 'GET', url: link.href, success: function(){window.location.reload();}});
- return false;
-}
+
Added: 3.x/trunk/limb/cms/shared/js/cp_common_controls.js
===================================================================
--- 3.x/trunk/limb/cms/shared/js/cp_common_controls.js (rev 0)
+++ 3.x/trunk/limb/cms/shared/js/cp_common_controls.js 2007-11-01 08:56:37 UTC (rev 6478)
@@ -0,0 +1,16 @@
+function toggle_selected(toggle_obj)
+{
+ var parent_form = toggle_obj.form;
+ var mark = toggle_obj.checked;
+
+ jQuery("input:checkbox[@name='ids[]']", parent_form).each(function(){
+ jQuery(this).attr("checked", mark);
+ });
+}
+
+function changed_field_highlighter()
+{
+ jQuery(this).change(function(){jQuery(this).prev('label').css({color: 'green'})});
+}
+
+
Modified: 3.x/trunk/limb/cms/template/_cms/js.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/js.html 2007-11-01 07:56:41 UTC (rev 6477)
+++ 3.x/trunk/limb/cms/template/_cms/js.html 2007-11-01 08:56:37 UTC (rev 6478)
@@ -10,4 +10,5 @@
<script src="/shared/cms/js/auto_tabs.js"></script>
<script src="/shared/cms/js/fixpng.js"></script>
<script src="/shared/cms/js/cp.js"></script>
+<script src="/shared/cms/js/cp_common_controls.js"></script>
Modified: 3.x/trunk/limb/cms/template/_cms/page.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/page.html 2007-11-01 07:56:41 UTC (rev 6477)
+++ 3.x/trunk/limb/cms/template/_cms/page.html 2007-11-01 08:56:37 UTC (rev 6478)
@@ -8,9 +8,7 @@
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
<core:INCLUDE file='_cms/styles.html'/>
- <core:INCLUDE file='_cms/extstyles.html'/>
<core:INCLUDE file='_cms/js.html'/>
- <core:INCLUDE file='_cms/extjs.html'/>
<script type="text/javascript" src="/shared/cms/js/accordion.js"></script>
</head>
<body>
More information about the limb-svn
mailing list