Index: admin_templates/categories/permissions_tab.tpl =================================================================== --- admin_templates/categories/permissions_tab.tpl (revision 14472) +++ admin_templates/categories/permissions_tab.tpl (working copy) @@ -67,7 +67,7 @@ - + Index: admin_templates/incs/custom_blocks.tpl =================================================================== --- admin_templates/incs/custom_blocks.tpl (revision 14472) +++ admin_templates/incs/custom_blocks.tpl (working copy) @@ -109,8 +109,9 @@ +
', '')" onmouseout="hide_form_error('')"> -  *: +  *: <inp2:FieldHintLabel title_label='$title' html_escape='1'/>
Index: admin_templates/incs/form_blocks.tpl =================================================================== --- admin_templates/incs/form_blocks.tpl (revision 14472) +++ admin_templates/incs/form_blocks.tpl (working copy) @@ -111,11 +111,11 @@ - +
Index: admin_templates/incs/grid_blocks.tpl =================================================================== --- admin_templates/incs/grid_blocks.tpl (revision 14472) +++ admin_templates/incs/grid_blocks.tpl (working copy) @@ -505,7 +505,7 @@
- + - - - + + + + + - - + + Index: admin_templates/regional/languages_export.tpl =================================================================== --- admin_templates/regional/languages_export.tpl (revision 14472) +++ admin_templates/regional/languages_export.tpl (working copy) @@ -79,7 +79,7 @@
'].InvertSelection(); this.checked=false;" ondblclick="Grids[''].ClearSelection(); this.checked=false;" /> - + Index: admin_templates/js/inp_ckconfig.js =================================================================== --- admin_templates/js/inp_ckconfig.js (revision 0) +++ admin_templates/js/inp_ckconfig.js (revision 0) @@ -0,0 +1,96 @@ +// Preview +//CKEDITOR.config.PreviewUrl = ''; +//CKEDITOR.config.ContentId = ''; + +//CKEDITOR.config.PreloadImages = [ CKEDITOR.config.SkinPath + 'images/toolbar.start.gif', CKEDITOR.config.SkinPath + 'images/toolbar.buttonarrow.gif', CKEDITOR.config.BasePath + 'plugins/images/document.gif' ] ; + +//CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ; + +CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,MediaEmbed'; + +//CKEDITOR.plugins.add('MySource'); +//CKEDITOR.plugins.add('MyPreview'); +//CKEDITOR.plugins.add('MyLink'); +//CKEDITOR.plugins.add('MyImage'); +//CKEDITOR.plugins.add('document', 'en,ru'); + +CKEDITOR.config.protectedSource.push( /(]+>)|(<\/inp2:[^\>]+>)|(]+\/>)/gi ) ; + +CKEDITOR.config.documentIconsUrl = '/system/user_files/icons'; // for document custom plugin + +CKEDITOR.config.toolbar_Default = [ + ['Styles'], + ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'], + ['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'], + ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'], + ['Find', 'Replace', 'Scayt'] +]; + +CKEDITOR.config.toolbar_Advanced = [ + ['Cut','Copy','Paste','PasteText','PasteFromWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-',/*My*/ 'Link','Unlink','Anchor','HorizontalRule','-',/*My*/ 'Image','Flash','MediaEmbed','Document','Table','SpecialChar'], + '/', + ['Bold','Italic','Underline','Strike','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','NumberedList','BulletedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'], + '/', + ['Styles','Font','FontSize','RemoveFormat','-','Scayt','-', /*My*/'Source', 'Maximize', 'ShowBlocks'] +]; + +//CKEDITOR.config.toolbar_Full = [ +// [ 'Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates' ], +// [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ], +// [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ], +// [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ], +// '/', +// [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ], +// [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ], +// [ 'Link','Unlink','Anchor' ], +// [ 'Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' ], +// '/', +// [ 'Styles','Format','Font','FontSize' ], +// [ 'TextColor','BGColor' ], +// [ 'Maximize', 'ShowBlocks','-','About' ] +//]; + +CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ; // p | div | br +CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ; // p | div | br + +CKEDITOR.config.keystrokes = [ + [ CKEDITOR.CTRL + 65 /*A*/, true ], + [ CKEDITOR.CTRL + 67 /*C*/, true ], + [ CKEDITOR.CTRL + 70 /*F*/, true ], + [ CKEDITOR.CTRL + 83 /*S*/, true ], + [ CKEDITOR.CTRL + 84 /*T*/, true ], + [ CKEDITOR.CTRL + 88 /*X*/, true ], + [ CKEDITOR.CTRL + 86 /*V*/, 'Paste' ], + [ CKEDITOR.CTRL + 45 /*INS*/, true ], + [ CKEDITOR.SHIFT + 45 /*INS*/, 'Paste' ], + [ CKEDITOR.CTRL + 88 /*X*/, 'Cut' ], + [ CKEDITOR.SHIFT + 46 /*DEL*/, 'Cut' ], + [ CKEDITOR.CTRL + 90 /*Z*/, 'Undo' ], + [ CKEDITOR.CTRL + 89 /*Y*/, 'Redo' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'Redo' ], + [ CKEDITOR.CTRL + 76 /*L*/, 'Link' ], + [ CKEDITOR.CTRL + 66 /*B*/, 'Bold' ], + [ CKEDITOR.CTRL + 73 /*I*/, 'Italic' ], + [ CKEDITOR.CTRL + 85 /*U*/, 'Underline' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 /*S*/, 'Save' ], + [ CKEDITOR.CTRL + CKEDITOR.ALT + 13 /*ENTER*/, 'FitWindow' ] +] ; + +//CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form'; + +CKEDITOR.config.font_names = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; +CKEDITOR.config.fontSize_sizes = 'xx-small;x-small;small;medium;large;x-large;xx-large' ; + +CKEDITOR.config.filebrowserBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html'; +CKEDITOR.config.filebrowserUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files'; + +CKEDITOR.config.filebrowserImageBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Images'; +CKEDITOR.config.filebrowserImageUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images'; + +CKEDITOR.config.filebrowserFlashBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Flash'; +CKEDITOR.config.filebrowserFlashUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash'; + +CKEDITOR.config.filebrowserDocumentBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Documents'; + +// add ability to browse for documents +//CKEDITOR.config.documentsBrowser = true ; Index: admin_templates/languages/phrase_edit.tpl =================================================================== --- admin_templates/languages/phrase_edit.tpl (revision 14472) +++ admin_templates/languages/phrase_edit.tpl (working copy) @@ -1,4 +1,4 @@ - + @@ -79,12 +79,14 @@
- + Index: admin_templates/regional/phrases_edit.tpl =================================================================== --- admin_templates/regional/phrases_edit.tpl (revision 14472) +++ admin_templates/regional/phrases_edit.tpl (working copy) @@ -78,12 +78,12 @@ - - + + - - + + Index: admin_templates/spelling_dictionary/spelling_dictionary_list.tpl =================================================================== --- admin_templates/spelling_dictionary/spelling_dictionary_list.tpl (revision 14472) +++ admin_templates/spelling_dictionary/spelling_dictionary_list.tpl (working copy) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_spelling_dictionary', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '', function() { std_precreate_item('spelling-dictionary', 'spelling_dictionary/spelling_dictionary_edit'); } ) ); Index: admin_templates/submissions/submission_view.tpl =================================================================== --- admin_templates/submissions/submission_view.tpl (revision 14472) +++ admin_templates/submissions/submission_view.tpl (working copy) @@ -150,7 +150,8 @@
-  *: + +  *: <inp2:FieldHintLabel title_label='$title' html_escape='1'/>