Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/icons/icon_left.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import_step2.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import_step2.tpl (.../languages_import_step2.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import_step2.tpl (.../languages_import_step2.tpl) (revision 7071) @@ -1,14 +1,12 @@ - - - + - - + + - -

@@ -22,8 +20,7 @@ " name="events[lang][OnImportCancel]" />
+ + - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + @@ -14,12 +12,12 @@ @@ -32,15 +30,14 @@ - + -
+ - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl =================================================================== diff -u -r6928 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 6928) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 7071) @@ -37,6 +37,7 @@ var $use_popups = truefalse; +var $use_toolbarlabels = truefalse; Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js =================================================================== diff -u -r7064 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 7064) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 7071) @@ -81,7 +81,7 @@ var startTime,endTime; function getDimensions(obj) { - var style,correction,height + var style if (obj.currentStyle) { style = obj.currentStyle; } @@ -93,10 +93,6 @@ for (var i in padding) if ( isNaN( padding[i] ) ) padding[i] = 0 for (var i in border) if ( isNaN( border[i] ) ) border[i] = 0 - correction = padding[0] + padding[2]; // + border[0] + border[2] - - height = obj.clientHeight - correction - var result = new Object(); result.innerHeight = obj.clientHeight - padding[0] - padding[2]; result.innerWidth = obj.clientWidth - padding[1] - padding[3]; @@ -450,7 +446,7 @@ { var table = document.getElementById(table_id); var heights = new Array(); - var style,height,correction; + var height for (var row=0; row' for (var col=this.LeftCells; col
'+this.Header[row][col]+'
' + o += '
'+this.Header[row][col]+'
' } o += '' o += '' Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js =================================================================== diff -u -r7036 -r7071 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 7036) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 7071) @@ -1188,4 +1188,19 @@ } } return $main_window.parent; + } + + function ClearBrowserSelection() + { + if (window.getSelection) { + // removeAllRanges will be supported by Opera from v 9+, do nothing by now + var selection = window.getSelection(); + if (selection.removeAllRanges) { // Mozilla & Opera 9+ +// alert('clearing FF') + window.getSelection().removeAllRanges(); + } + } else if (document.selection && !is.opera) { // IE +// alert('clearing IE') + document.selection.empty(); + } } \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_email.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + @@ -17,32 +15,32 @@ { openSelector('emailevents.module', '', 'FromUserId', null, 'OnSaveSelected'); } - + var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('usertogroup', '', edit ) ); - - + + //a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - + a_toolbar.AddButton( new ToolBarButton('approve', '', function() { submit_event('emailevents.module','OnMassApprove'); } ) ); - + a_toolbar.AddButton( new ToolBarButton('decline', '', function() { submit_event('emailevents.module','OnMassDecline'); } - ) ); - + ) ); + a_toolbar.AddButton( new ToolBarButton('frontend_mail', '', function() { submit_event('emailevents.module','OnFrontOnly'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - + a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar,'view'); } Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid.js =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid.js (.../grid.js) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/grid.js (.../grid.js) (revision 7071) @@ -164,18 +164,11 @@ if (typeof (this.Grid.OnUnSelect) == 'function' ) { this.Grid.OnUnSelect(this.ItemId); } + this.Grid.LastSelectedId = null; } GridItem.prototype.ClearBrowserSelection = function() { - if (window.getSelection) { - // removeAllRanges will be supported by Opera from v 9+, do nothing by now - var selection = window.getSelection(); - if (selection.removeAllRanges) { // Mozilla & Opera 9+ - window.getSelection().removeAllRanges(); - } - } else if (document.selection && !is.opera) { // IE - document.selection.empty(); - } + ClearBrowserSelection(); } GridItem.prototype.Click = function (ev) @@ -184,6 +177,7 @@ this.Grid.ClearAlternativeGridsSelection('GridItem.Click'); var e = !is.ie ? ev : window.event; + if (e.shiftKey && !this.Grid.RadioMode) { this.Grid.SelectRangeUpTo(this.sequence); } @@ -194,7 +188,14 @@ else { if (!(this.Grid.RadioMode && this.Grid.LastSelectedId == this.ItemId && this.selected)) { // don't clear selection if item same as current is selected - this.Grid.ClearSelection(null,'GridItem.Click'); + if (!this.Grid.StickySelection) { + this.Grid.ClearSelection(null,'GridItem.Click'); + } + else { + if (this.Grid.LastSelectedId == this.ItemId) { + return; + } + } this.Toggle(); } } @@ -250,6 +251,10 @@ this.AlternativeGrids = new Array(); this.DependantButtons = new Array(); this.RadioMode = false; + + // K3-style sticky selection, selection an item does not unselect currently selected + // even w/o Ctrl key pressed + this.StickySelection = false; } Grid.prototype.AddItem = function( an_item ) { @@ -280,6 +285,33 @@ this.Items[i].Init(); } this.ClearSelection( true,'Grid.InitItems' ); + + var a_Grid = this; + addEvent(document, 'keyup', function(ev) { + var e = !is.ie ? ev : window.event; + switch (e.keyCode) { + case 65: +// if (e.ctrlKey) alert('Ctrl A'); + a_Grid.SelectAll(); + ClearBrowserSelection() +// window.setTimeout(ClearBrowserSelection, 500); + break; + case 27: + a_Grid.ClearSelection(); + break; + case 33: + case 37: + //alert('<-') // go to prev page here + break; + case 34: + case 39: + // alert('->') // go to next page here + break; + case 88: + ClearBrowserSelection(); + break; + } + }); } Grid.prototype.DisableClicking = function() { Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/no_permission.tpl =================================================================== diff -u -r7051 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/no_permission.tpl (.../no_permission.tpl) (revision 7051) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/no_permission.tpl (.../no_permission.tpl) (revision 7071) @@ -1,7 +1,5 @@ - + - - @@ -13,7 +11,7 @@ - + @@ -47,7 +45,7 @@ Redirect From Tag: no

- + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/email_messages_edit.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/email_messages_edit.tpl (.../email_messages_edit.tpl) (revision 7071) @@ -1,8 +1,6 @@ - - - + @@ -18,14 +16,14 @@ submit_event('emailmessages','OnCreateOnUpdate'); } ) ); - + a_toolbar.AddButton( new ToolBarButton('cancel', '', function() { submit_event('emailmessages','OnCancel'); } ) ); - + a_toolbar.Render(); - + @@ -34,16 +32,15 @@ - + - + -
+ - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 7071) @@ -1,7 +1,6 @@ - + - Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/icons/icon_right.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export_step2.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export_step2.tpl (.../languages_export_step2.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_export_step2.tpl (.../languages_export_step2.tpl) (revision 7071) @@ -1,17 +1,15 @@ - - - + - + - + "> - + "> - - -
@@ -20,15 +18,14 @@  
+ + + - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + @@ -17,45 +15,45 @@ { std_edit_item('lang', 'regional/languages_edit'); } - + var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('new_language', '', function() { std_precreate_item('lang', 'regional/languages_edit') } ) ); - + a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); a_toolbar.AddButton( new ToolBarButton('delete', '', function() { std_delete_items('lang') } ) ); - - + + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - + a_toolbar.AddButton( new ToolBarButton('primary_language', '', function() { submit_event('lang','OnSetPrimary'); } ) ); - - + + a_toolbar.AddButton( new ToolBarButton('import_language', '', function() { - redirect(''); + redirect(''); } ) ); - + a_toolbar.AddButton( new ToolBarButton('export_language', '', function() { submit_event('lang','OnExportLanguage'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - + a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar,'view'); } ) ); - + a_toolbar.Render(); Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl =================================================================== diff -u -r7051 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 7051) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl (.../column_picker.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/column_picker.tpl (.../column_picker.tpl) (revision 7071) @@ -1,9 +1,6 @@ - - - - + @@ -47,32 +44,37 @@ - - +
+ @@ -30,15 +28,14 @@
- +
- + + + + + - - Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl =================================================================== diff -u -r6932 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 6932) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 7071) @@ -1,4 +1,29 @@ - + + +

Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl =================================================================== diff -u -r7036 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 7036) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + @@ -78,23 +76,23 @@ + b_toolbar.Render(); + +
- + + +   + +
+ - - +

-
-
- + 		+
+
- - - +

- -
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import.tpl (.../languages_import.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_import.tpl (.../languages_import.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + @@ -21,7 +19,7 @@ submit_event('lang', 'OnGoBack'); } ) ); - + a_toolbar.Render();
- + - + - + -
+ - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7071) @@ -1,7 +1,5 @@ - - - + @@ -27,7 +25,7 @@ return false; } } - + function ValidatePassFields(){ var el=false; var validated=true; @@ -41,29 +39,29 @@ } return validated; } - + function toggle_section($label) { var $table = document.getElementById('config_table'); var $row = null; var $is_visible = false; - + for (var $i = 0; $i < $table.rows.length; $i++) { $row = $table.rows[$i]; if ($row.getAttribute('header_label') != $label) { continue; } - + if (!$row.style.display) { $row.style.display = document.all ? 'block' : 'table-row'; } - + $is_visible = !($row.style.display == 'none'); $row.style.display = $is_visible ? 'none' : (document.all ? 'block' : 'table-row'); - + document.getElementById('toggle_mark['+$label+']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']'; } } - + var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('select', '', function() { if (ValidatePassFields()){ Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js =================================================================== diff -u -r7029 -r7071 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7029) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7071) @@ -58,7 +58,7 @@ var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : ''; var o = '
' o += ''; - o += '
'+this.Label; + if (this.ToolBar.UseLabels) o += '
'+this.Label; o += '
' return o; } @@ -166,7 +166,11 @@ ToolBarSeparator.prototype.GetHTML = function() { var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : ''; - return '
'; + var padding = this.ToolBar.UseLabels ? '7px' : '2px' + return '
'; + + var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : ''; + return '
'; } ToolBarSeparator.prototype.Init = function() { @@ -204,6 +208,7 @@ this.Module = $module ? $module : 'core'; this.IconPrefix = icon_prefix ? icon_prefix : 'tool_'; this.Buttons = new Array(); + this.UseLabels = $use_toolbarlabels ? $use_toolbarlabels : false; } ToolBar.prototype.AddButton = function(a_button) Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 7071) @@ -1,8 +1,6 @@ - - - + @@ -24,9 +22,9 @@ submit_event('lang','OnCancelEdit'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { go_to_id('lang', ''); } @@ -35,16 +33,16 @@ go_to_id('lang', ''); } ) ); - - - + + + a_toolbar.Render(); - + a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - + a_toolbar.DisableButton('next'); @@ -59,19 +57,20 @@ +
- + - + - + @@ -96,7 +95,6 @@ -
 
- + +
- \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl (.../root_edit_password.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl (.../root_edit_password.tpl) (revision 7071) @@ -1,9 +1,8 @@ - + - @@ -23,7 +22,7 @@ window.close(); } ) ); - + a_toolbar.Render(); @@ -33,10 +32,9 @@ - + -
+ - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl =================================================================== diff -u -r7027 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7027) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7071) @@ -1,8 +1,6 @@ - - - + @@ -22,9 +20,9 @@ submit_event('u','OnCancelEdit'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - + a_toolbar.AddButton( new ToolBarButton('prev', '', function() { go_to_id('u', ''); } @@ -33,16 +31,16 @@ go_to_id('u', ''); } ) ); - - - + + + a_toolbar.Render(); - + a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - + a_toolbar.DisableButton('next'); @@ -58,15 +56,14 @@ - + -
+ - \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl =================================================================== diff -u -r7029 -r7071 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl (.../phrases_edit.tpl) (revision 7029) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/phrases_edit.tpl (.../phrases_edit.tpl) (revision 7071) @@ -1,8 +1,6 @@ - - - +