Changeset 1486009
- Timestamp:
- 08/29/2016 11:28:42 PM (10 years ago)
- Location:
- cm-css-columns/trunk
- Files:
-
- 4 edited
-
README.txt (modified) (2 diffs)
-
admin/Admin.php (modified) (3 diffs)
-
admin/css/admin.css (modified) (1 diff)
-
admin/js/tinymce-cm-css-columns.js (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
cm-css-columns/trunk/README.txt
r1482901 r1486009 3 3 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=C53QMVCECEQPA 4 4 Tags: css3, multiple columns 5 Requires at least: 4. 0.05 Requires at least: 4.5.0 6 6 Tested up to: 4.6 7 7 Stable tag: 1.1.0 … … 36 36 37 37 == Changelog == 38 39 = ?? = 40 * attributes dialog for [css_columns]-shortcode 38 41 39 42 = 1.1.0 = -
cm-css-columns/trunk/admin/Admin.php
r1485899 r1486009 2 2 3 3 namespace codemacher\CssColumns; 4 4 5 require_once plugin_dir_path(dirname(__FILE__)) . 'admin/OptionsView.php'; 6 5 7 /** 6 8 * The admin-specific functionality of the plugin. … … 111 113 * class. 112 114 */ 115 wp_register_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/admin.js', array('jquery'), $this->version, false); 113 116 wp_enqueue_script('jquery-ui-dialog'); 114 wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/admin.js', array('jquery'), $this->version, false); 117 // transfer the default values to javascript using the localize method 118 wp_localize_script( $this->plugin_name, 'cm_css_columns_option_values', $this->default_values ); 119 wp_enqueue_script($this->plugin_name); 115 120 } 116 121 … … 247 252 fclose($file); 248 253 } 254 249 255 } -
cm-css-columns/trunk/admin/css/admin.css
r1482893 r1486009 6 6 z-index:10000 !important; 7 7 } 8 .ui-dialog-content label { 9 padding-top:0.8em; 10 } 11 .ui-dialog-content label { 12 width:60%; 13 display:inline-block; 14 margin-bottom: 0.8em; 15 } 16 .ui-dialog-content input, .ui-dialog-content select { 17 width:35%; 18 display:inline-block; 19 margin-bottom: 0.8em; 20 } -
cm-css-columns/trunk/admin/js/tinymce-cm-css-columns.js
r1485899 r1486009 36 36 $.CssColumns = function (editor) { 37 37 var that = this; 38 console.log($.CssColumns.defaultOptions); 38 39 this.editor = editor; 39 40 this.dialogs = new Array(); … … 42 43 this.dialogs['css_no_break'] = _getNewDialog('css_no_break'); 43 44 45 44 46 function _getNewDialog(shortcode) { 45 var tmp = $('<div id="'+shortcode+'_dialog">'+_getDialogContent(shortcode)+'</div>'); 46 var title = '['+shortcode+'] settings'; 47 var tmp = $('<div id="' + shortcode + '_dialog"></div>'); 48 tmp.append(_getDialogContent(shortcode)); 49 var title = '[' + shortcode + '] attributes'; 47 50 tmp.dialog({ 48 51 title: title, … … 51 54 width: 350, 52 55 modal: true, 53 dialogClass: shortcode +'_dialog',56 dialogClass: shortcode + '_dialog', 54 57 buttons: { 55 58 "Insert shortcode": function () { 56 that.insertShortcode(shortcode); 59 var options = _getDialogValues(shortcode); 60 that.insertShortcode(shortcode, options); 57 61 that.closeSettingsDialog(shortcode); 58 62 }, 59 63 Cancel: function () { 64 console.log($('#gap', this).val()); 60 65 that.closeSettingsDialog(shortcode); 61 66 } 62 67 }, 63 68 close: function () { 64 console.log('dialog close cb for ' +shortcode);69 console.log('dialog close cb for ' + shortcode); 65 70 } 66 71 }); … … 68 73 } 69 74 ; 70 75 71 76 function _getDialogContent(shortcode) { 72 var tmp = ''; 73 return tmp; 77 if (shortcode === 'css_columns') { 78 var tmp = $('<div class="inner"></div>'); 79 tmp.append($('<label for="count">Number of columns</label>')); 80 tmp.append($('<input class="ui-corner-all" type="text" name="count" id="count" placeholder="' + $.CssColumns.defaultOptions.css_columns.count + '"/>')); 81 tmp.append($('<label for="width">Optimal column width</label>')); 82 tmp.append($('<input class="ui-corner-all" type="text" name="width" id="width" placeholder="' + $.CssColumns.defaultOptions.css_columns.width + '"/>')); 83 tmp.append($('<label for="gap">Column gap</label>')); 84 tmp.append($('<input class="ui-corner-all" type="text" name="gap" id="gap" placeholder="' + $.CssColumns.defaultOptions.css_columns.gap + '"/>')); 85 tmp.append($('<label for="rule_color">Rule color</label>')); 86 tmp.append($('<input class="ui-corner-all" type="color" name="rule_color" id="rule_color" placeholder="' + $.CssColumns.defaultOptions.css_columns.gap + '"/>')); 87 var rule_section = $('<div class="rule_section"></div>'); 88 89 rule_section.append($('<label for="rule_style">Rule style</label>')); 90 var rule_style = ($('<select name="rule_style" id="rule_style"></select>')); 91 rule_style.append($('<option value="none">none</option>')); 92 rule_style.append($('<option value="hidden">hidden</option>')); 93 rule_style.append($('<option value="dotted">dotted</option>')); 94 rule_style.append($('<option value="dashed">dashed</option>')); 95 rule_style.append($('<option value="solid">solid</option>')); 96 rule_style.append($('<option value="double">double</option>')); 97 rule_style.append($('<option value="groove">groove</option>')); 98 rule_style.append($('<option value="ridge">ridge</option>')); 99 rule_style.append($('<option value="inset">inset</option>')); 100 rule_style.append($('<option value="outset">outset</option>')); 101 rule_style.append($('<option value="initial">initial</option>')); 102 rule_style.append($('<option value="inherit">inherit</option>')); 103 rule_section.append(rule_style); 104 105 rule_section.append($('<label for="rule_width">Rule width</label>')); 106 rule_section.append($('<input class="ui-corner-all" type="text" name="rule_width" id="rule_width" placeholder="' + $.CssColumns.defaultOptions.css_columns.rule_width + '"/>')); 107 tmp.append(rule_section); 108 return tmp; 109 } 74 110 } 111 ; 112 113 function _getDialogValues(shortcode) { 114 var result = new Object(); 115 if (shortcode === 'css_columns') { 116 var dialog = that.dialogs['css_columns']; 117 result.count = $('#count', dialog).val(); 118 result.width = $('#width', dialog).val(); 119 result.gap = $('#gap', dialog).val(); 120 result.rule_color = $('#rule_color', dialog).val(); 121 result.rule_style = $('#rule_style', dialog).val(); 122 result.rule_width = $('#rule_width', dialog).val(); 123 } 124 return result; 125 } 126 ; 75 127 }; 76 128 77 129 $.CssColumns.prototype = { 78 insertShortcode: function (shortcode ) {130 insertShortcode: function (shortcode, options) { 79 131 var orgText = this.editor.selection.getContent(); 80 132 this.editor.undoManager.beforeChange(); 81 this.editor.selection.setContent('['+shortcode+']' + orgText + '[/'+shortcode+']'); 133 var scode = '[' + shortcode; 134 135 if (shortcode === 'css_columns') { 136 if (options.count !== '' && options.count !== $.CssColumns.defaultOptions.css_columns.count) { 137 scode += ' count=' + options.count; 138 } 139 if (options.width !== '' && options.width !== $.CssColumns.defaultOptions.css_columns.width) { 140 scode += ' width=' + options.width; 141 } 142 if (options.gap !== '' && options.gap !== $.CssColumns.defaultOptions.css_columns.gap) { 143 scode += ' gap=' + options.gap; 144 } 145 if (options.rule_color !== '' && options.rule_color !== $.CssColumns.defaultOptions.css_columns.rule_color) { 146 scode += ' rule_color=' + options.rule_color; 147 } 148 if (options.rule_style !== '' && options.rule_style !== $.CssColumns.defaultOptions.css_columns.rule_style) { 149 scode += ' rule_style=' + options.rule_style; 150 } 151 if (options.rule_width !== '' && options.rule_width !== $.CssColumns.defaultOptions.css_columns.rule_width) { 152 scode += ' rule_width=' + options.rule_width; 153 } 154 155 } 156 scode += ']'; 157 scode += orgText; 158 scode += '[/' + shortcode + ']'; 159 this.editor.selection.setContent(scode); 82 160 }, 83 161 openSettingsDialog: function (shortcode) { … … 91 169 $.CssColumns.defaultOptions = { 92 170 css_columns: { 93 gap: false,94 width: false,95 count: false,96 rule_color: false,97 rule_style: false,98 rule_width: false171 gap: cm_css_columns_option_values["gap"], 172 width: cm_css_columns_option_values["width"], 173 count: cm_css_columns_option_values["count"], 174 rule_color: cm_css_columns_option_values["rule_color"], 175 rule_style: cm_css_columns_option_values["rule_style"], 176 rule_width: cm_css_columns_option_values["rule_width"] 99 177 }, 100 178 css_col_span: { 101 cols: false,102 tag: false179 cols: cm_css_columns_option_values["span_cols"], 180 tag: cm_css_columns_option_values["span_tag"] 103 181 }, 104 182 css_no_break: { 105 type: false,106 tag: false183 type: cm_css_columns_option_values["no_break_type"], 184 tag: cm_css_columns_option_values["no_break_tag"] 107 185 } 108 186 };
Note: See TracChangeset
for help on using the changeset viewer.