lolita 3.1.5 → 3.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (45) hide show
  1. data/Gemfile +2 -4
  2. data/History.rdoc +19 -2
  3. data/README.rdoc +3 -0
  4. data/VERSION +1 -1
  5. data/app/controllers/lolita/rest_controller.rb +7 -2
  6. data/app/views/components/lolita/configuration/column/_sort.html.erb +1 -1
  7. data/app/views/components/lolita/configuration/columns/_last.html.erb +2 -2
  8. data/app/views/components/lolita/configuration/field/string/text/_display.html.erb +2 -18
  9. data/app/views/components/lolita/configuration/list/_new_resource.html.erb +1 -1
  10. data/app/views/components/lolita/configuration/list/_title.html.erb +1 -1
  11. data/app/views/components/lolita/configuration/tabs/_display.html.erb +0 -1
  12. data/app/views/components/lolita/navigation/_tree.html.erb +10 -6
  13. data/app/views/components/lolita/shared/_flash.html.erb +4 -12
  14. data/app/views/layouts/lolita/application.html.erb +8 -4
  15. data/config/locales/default/lv.yml +181 -0
  16. data/config/locales/en.yml +5 -0
  17. data/config/locales/lv.yml +21 -0
  18. data/lib/lolita/adapter/active_record.rb +1 -1
  19. data/lib/lolita/adapter/mongoid.rb +1 -1
  20. data/lib/lolita/configuration/column.rb +28 -5
  21. data/lib/lolita/configuration/columns.rb +4 -4
  22. data/lib/lolita/configuration/field.rb +6 -1
  23. data/lib/lolita/configuration/list.rb +10 -10
  24. data/lib/lolita/configuration/tab.rb +9 -1
  25. data/lib/lolita/hooks.rb +34 -4
  26. data/lib/lolita/rails.rb +2 -3
  27. data/lib/lolita/rails/all.rb +3 -0
  28. data/lib/lolita/rails/routes.rb +1 -1
  29. data/lib/lolita/support/formatter.rb +2 -2
  30. data/lib/lolita/support/formatter/rails.rb +2 -2
  31. data/lolita.gemspec +17 -9
  32. data/public/javascripts/jquery-1.6.min.js +16 -0
  33. data/public/javascripts/jquery-ui-1.8.13.min.js +407 -0
  34. data/public/javascripts/lolita/main.js +27 -1
  35. data/public/javascripts/lolita/tab.js +0 -3
  36. data/public/javascripts/tinymce/utils/editable_selects.js +70 -0
  37. data/public/javascripts/tinymce/utils/form_utils.js +210 -0
  38. data/public/javascripts/tinymce/utils/mctabs.js +162 -0
  39. data/public/javascripts/tinymce/utils/validate.js +252 -0
  40. data/public/javascripts/tinymce_config.js +15 -0
  41. data/spec/configuration/column_spec.rb +40 -8
  42. data/spec/configuration/columns_spec.rb +1 -1
  43. data/spec/support/formatter_spec.rb +2 -2
  44. metadata +16 -8
  45. data/public/javascripts/jquery-1.5.1.min.js +0 -16
@@ -4,4 +4,30 @@ $(function(){
4
4
  "X-CSRF-Token": $("meta[name='csrf-token']").attr("content")
5
5
  }
6
6
  })
7
- })
7
+ $("#flash").slideUp("fast");
8
+ $("#flash").live("click", function(){
9
+ $(this).slideUp("fast");
10
+ })
11
+
12
+ $("#flash").ajaxComplete(function(e,request){
13
+ var notice=request.getResponseHeader("Lolita-Notice");
14
+ var error=request.getResponseHeader("Lolita-Error");
15
+ if(notice){
16
+ show_flash("<span style='color:green'>"+notice+"</span>");
17
+ }else{
18
+ if(error){
19
+ show_flash("<span style='color:red'>"+error+"</span>");
20
+ }
21
+ }
22
+ })
23
+ })
24
+
25
+ function show_flash(html){
26
+ var flash=$("#flash")
27
+ flash.stop(true)
28
+ flash.hide(0)
29
+ flash.html(html)
30
+ flash.slideDown("fast").delay(8000).slideUp("fast",function(){
31
+ $(this).html("")
32
+ })
33
+ }
@@ -39,7 +39,4 @@ $(function(){
39
39
  tab_title.data("closed",!closed)
40
40
  })
41
41
  // Flash is hidden when clicked on
42
- $("#flash").live("click", function(){
43
- $(this).slideUp("fast");
44
- })
45
42
  })
@@ -0,0 +1,70 @@
1
+ /**
2
+ * editable_selects.js
3
+ *
4
+ * Copyright 2009, Moxiecode Systems AB
5
+ * Released under LGPL License.
6
+ *
7
+ * License: http://tinymce.moxiecode.com/license
8
+ * Contributing: http://tinymce.moxiecode.com/contributing
9
+ */
10
+
11
+ var TinyMCE_EditableSelects = {
12
+ editSelectElm : null,
13
+
14
+ init : function() {
15
+ var nl = document.getElementsByTagName("select"), i, d = document, o;
16
+
17
+ for (i=0; i<nl.length; i++) {
18
+ if (nl[i].className.indexOf('mceEditableSelect') != -1) {
19
+ o = new Option('(value)', '__mce_add_custom__');
20
+
21
+ o.className = 'mceAddSelectValue';
22
+
23
+ nl[i].options[nl[i].options.length] = o;
24
+ nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
25
+ }
26
+ }
27
+ },
28
+
29
+ onChangeEditableSelect : function(e) {
30
+ var d = document, ne, se = window.event ? window.event.srcElement : e.target;
31
+
32
+ if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
33
+ ne = d.createElement("input");
34
+ ne.id = se.id + "_custom";
35
+ ne.name = se.name + "_custom";
36
+ ne.type = "text";
37
+
38
+ ne.style.width = se.offsetWidth + 'px';
39
+ se.parentNode.insertBefore(ne, se);
40
+ se.style.display = 'none';
41
+ ne.focus();
42
+ ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
43
+ ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
44
+ TinyMCE_EditableSelects.editSelectElm = se;
45
+ }
46
+ },
47
+
48
+ onBlurEditableSelectInput : function() {
49
+ var se = TinyMCE_EditableSelects.editSelectElm;
50
+
51
+ if (se) {
52
+ if (se.previousSibling.value != '') {
53
+ addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
54
+ selectByValue(document.forms[0], se.id, se.previousSibling.value);
55
+ } else
56
+ selectByValue(document.forms[0], se.id, '');
57
+
58
+ se.style.display = 'inline';
59
+ se.parentNode.removeChild(se.previousSibling);
60
+ TinyMCE_EditableSelects.editSelectElm = null;
61
+ }
62
+ },
63
+
64
+ onKeyDown : function(e) {
65
+ e = e || window.event;
66
+
67
+ if (e.keyCode == 13)
68
+ TinyMCE_EditableSelects.onBlurEditableSelectInput();
69
+ }
70
+ };
@@ -0,0 +1,210 @@
1
+ /**
2
+ * form_utils.js
3
+ *
4
+ * Copyright 2009, Moxiecode Systems AB
5
+ * Released under LGPL License.
6
+ *
7
+ * License: http://tinymce.moxiecode.com/license
8
+ * Contributing: http://tinymce.moxiecode.com/contributing
9
+ */
10
+
11
+ var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
12
+
13
+ function getColorPickerHTML(id, target_form_element) {
14
+ var h = "", dom = tinyMCEPopup.dom;
15
+
16
+ if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
17
+ label.id = label.id || dom.uniqueId();
18
+ }
19
+
20
+ h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
21
+ h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
22
+
23
+ return h;
24
+ }
25
+
26
+ function updateColor(img_id, form_element_id) {
27
+ document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
28
+ }
29
+
30
+ function setBrowserDisabled(id, state) {
31
+ var img = document.getElementById(id);
32
+ var lnk = document.getElementById(id + "_link");
33
+
34
+ if (lnk) {
35
+ if (state) {
36
+ lnk.setAttribute("realhref", lnk.getAttribute("href"));
37
+ lnk.removeAttribute("href");
38
+ tinyMCEPopup.dom.addClass(img, 'disabled');
39
+ } else {
40
+ if (lnk.getAttribute("realhref"))
41
+ lnk.setAttribute("href", lnk.getAttribute("realhref"));
42
+
43
+ tinyMCEPopup.dom.removeClass(img, 'disabled');
44
+ }
45
+ }
46
+ }
47
+
48
+ function getBrowserHTML(id, target_form_element, type, prefix) {
49
+ var option = prefix + "_" + type + "_browser_callback", cb, html;
50
+
51
+ cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
52
+
53
+ if (!cb)
54
+ return "";
55
+
56
+ html = "";
57
+ html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
58
+ html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
59
+
60
+ return html;
61
+ }
62
+
63
+ function openBrowser(img_id, target_form_element, type, option) {
64
+ var img = document.getElementById(img_id);
65
+
66
+ if (img.className != "mceButtonDisabled")
67
+ tinyMCEPopup.openBrowser(target_form_element, type, option);
68
+ }
69
+
70
+ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
71
+ if (!form_obj || !form_obj.elements[field_name])
72
+ return;
73
+
74
+ if (!value)
75
+ value = "";
76
+
77
+ var sel = form_obj.elements[field_name];
78
+
79
+ var found = false;
80
+ for (var i=0; i<sel.options.length; i++) {
81
+ var option = sel.options[i];
82
+
83
+ if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
84
+ option.selected = true;
85
+ found = true;
86
+ } else
87
+ option.selected = false;
88
+ }
89
+
90
+ if (!found && add_custom && value != '') {
91
+ var option = new Option(value, value);
92
+ option.selected = true;
93
+ sel.options[sel.options.length] = option;
94
+ sel.selectedIndex = sel.options.length - 1;
95
+ }
96
+
97
+ return found;
98
+ }
99
+
100
+ function getSelectValue(form_obj, field_name) {
101
+ var elm = form_obj.elements[field_name];
102
+
103
+ if (elm == null || elm.options == null || elm.selectedIndex === -1)
104
+ return "";
105
+
106
+ return elm.options[elm.selectedIndex].value;
107
+ }
108
+
109
+ function addSelectValue(form_obj, field_name, name, value) {
110
+ var s = form_obj.elements[field_name];
111
+ var o = new Option(name, value);
112
+ s.options[s.options.length] = o;
113
+ }
114
+
115
+ function addClassesToList(list_id, specific_option) {
116
+ // Setup class droplist
117
+ var styleSelectElm = document.getElementById(list_id);
118
+ var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
119
+ styles = tinyMCEPopup.getParam(specific_option, styles);
120
+
121
+ if (styles) {
122
+ var stylesAr = styles.split(';');
123
+
124
+ for (var i=0; i<stylesAr.length; i++) {
125
+ if (stylesAr != "") {
126
+ var key, value;
127
+
128
+ key = stylesAr[i].split('=')[0];
129
+ value = stylesAr[i].split('=')[1];
130
+
131
+ styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
132
+ }
133
+ }
134
+ } else {
135
+ tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
136
+ styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
137
+ });
138
+ }
139
+ }
140
+
141
+ function isVisible(element_id) {
142
+ var elm = document.getElementById(element_id);
143
+
144
+ return elm && elm.style.display != "none";
145
+ }
146
+
147
+ function convertRGBToHex(col) {
148
+ var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
149
+
150
+ var rgb = col.replace(re, "$1,$2,$3").split(',');
151
+ if (rgb.length == 3) {
152
+ r = parseInt(rgb[0]).toString(16);
153
+ g = parseInt(rgb[1]).toString(16);
154
+ b = parseInt(rgb[2]).toString(16);
155
+
156
+ r = r.length == 1 ? '0' + r : r;
157
+ g = g.length == 1 ? '0' + g : g;
158
+ b = b.length == 1 ? '0' + b : b;
159
+
160
+ return "#" + r + g + b;
161
+ }
162
+
163
+ return col;
164
+ }
165
+
166
+ function convertHexToRGB(col) {
167
+ if (col.indexOf('#') != -1) {
168
+ col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
169
+
170
+ r = parseInt(col.substring(0, 2), 16);
171
+ g = parseInt(col.substring(2, 4), 16);
172
+ b = parseInt(col.substring(4, 6), 16);
173
+
174
+ return "rgb(" + r + "," + g + "," + b + ")";
175
+ }
176
+
177
+ return col;
178
+ }
179
+
180
+ function trimSize(size) {
181
+ return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
182
+ }
183
+
184
+ function getCSSSize(size) {
185
+ size = trimSize(size);
186
+
187
+ if (size == "")
188
+ return "";
189
+
190
+ // Add px
191
+ if (/^[0-9]+$/.test(size))
192
+ size += 'px';
193
+ // Sanity check, IE doesn't like broken values
194
+ else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
195
+ return "";
196
+
197
+ return size;
198
+ }
199
+
200
+ function getStyle(elm, attrib, style) {
201
+ var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
202
+
203
+ if (val != '')
204
+ return '' + val;
205
+
206
+ if (typeof(style) == 'undefined')
207
+ style = attrib;
208
+
209
+ return tinyMCEPopup.dom.getStyle(elm, style);
210
+ }
@@ -0,0 +1,162 @@
1
+ /**
2
+ * mctabs.js
3
+ *
4
+ * Copyright 2009, Moxiecode Systems AB
5
+ * Released under LGPL License.
6
+ *
7
+ * License: http://tinymce.moxiecode.com/license
8
+ * Contributing: http://tinymce.moxiecode.com/contributing
9
+ */
10
+
11
+ function MCTabs() {
12
+ this.settings = [];
13
+ this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
14
+ };
15
+
16
+ MCTabs.prototype.init = function(settings) {
17
+ this.settings = settings;
18
+ };
19
+
20
+ MCTabs.prototype.getParam = function(name, default_value) {
21
+ var value = null;
22
+
23
+ value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
24
+
25
+ // Fix bool values
26
+ if (value == "true" || value == "false")
27
+ return (value == "true");
28
+
29
+ return value;
30
+ };
31
+
32
+ MCTabs.prototype.showTab =function(tab){
33
+ tab.className = 'current';
34
+ tab.setAttribute("aria-selected", true);
35
+ tab.setAttribute("aria-expanded", true);
36
+ tab.tabIndex = 0;
37
+ };
38
+
39
+ MCTabs.prototype.hideTab =function(tab){
40
+ var t=this;
41
+
42
+ tab.className = '';
43
+ tab.setAttribute("aria-selected", false);
44
+ tab.setAttribute("aria-expanded", false);
45
+ tab.tabIndex = -1;
46
+ };
47
+
48
+ MCTabs.prototype.showPanel = function(panel) {
49
+ panel.className = 'current';
50
+ panel.setAttribute("aria-hidden", false);
51
+ };
52
+
53
+ MCTabs.prototype.hidePanel = function(panel) {
54
+ panel.className = 'panel';
55
+ panel.setAttribute("aria-hidden", true);
56
+ };
57
+
58
+ MCTabs.prototype.getPanelForTab = function(tabElm) {
59
+ return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
60
+ };
61
+
62
+ MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
63
+ var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
64
+
65
+ tabElm = document.getElementById(tab_id);
66
+
67
+ if (panel_id === undefined) {
68
+ panel_id = t.getPanelForTab(tabElm);
69
+ }
70
+
71
+ panelElm= document.getElementById(panel_id);
72
+ panelContainerElm = panelElm ? panelElm.parentNode : null;
73
+ tabContainerElm = tabElm ? tabElm.parentNode : null;
74
+ selectionClass = t.getParam('selection_class', 'current');
75
+
76
+ if (tabElm && tabContainerElm) {
77
+ nodes = tabContainerElm.childNodes;
78
+
79
+ // Hide all other tabs
80
+ for (i = 0; i < nodes.length; i++) {
81
+ if (nodes[i].nodeName == "LI") {
82
+ t.hideTab(nodes[i]);
83
+ }
84
+ }
85
+
86
+ // Show selected tab
87
+ t.showTab(tabElm);
88
+ }
89
+
90
+ if (panelElm && panelContainerElm) {
91
+ nodes = panelContainerElm.childNodes;
92
+
93
+ // Hide all other panels
94
+ for (i = 0; i < nodes.length; i++) {
95
+ if (nodes[i].nodeName == "DIV")
96
+ t.hidePanel(nodes[i]);
97
+ }
98
+
99
+ if (!avoid_focus) {
100
+ tabElm.focus();
101
+ }
102
+
103
+ // Show selected panel
104
+ t.showPanel(panelElm);
105
+ }
106
+ };
107
+
108
+ MCTabs.prototype.getAnchor = function() {
109
+ var pos, url = document.location.href;
110
+
111
+ if ((pos = url.lastIndexOf('#')) != -1)
112
+ return url.substring(pos + 1);
113
+
114
+ return "";
115
+ };
116
+
117
+
118
+ //Global instance
119
+ var mcTabs = new MCTabs();
120
+
121
+ tinyMCEPopup.onInit.add(function() {
122
+ var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
123
+
124
+ each(dom.select('div.tabs'), function(tabContainerElm) {
125
+ var keyNav;
126
+
127
+ dom.setAttrib(tabContainerElm, "role", "tablist");
128
+
129
+ var items = tinyMCEPopup.dom.select('li', tabContainerElm);
130
+ var action = function(id) {
131
+ mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
132
+ mcTabs.onChange.dispatch(id);
133
+ };
134
+
135
+ each(items, function(item) {
136
+ dom.setAttrib(item, 'role', 'tab');
137
+ dom.bind(item, 'click', function(evt) {
138
+ action(item.id);
139
+ });
140
+ });
141
+
142
+ dom.bind(dom.getRoot(), 'keydown', function(evt) {
143
+ if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
144
+ keyNav.moveFocus(evt.shiftKey ? -1 : 1);
145
+ tinymce.dom.Event.cancel(evt);
146
+ }
147
+ });
148
+
149
+ each(dom.select('a', tabContainerElm), function(a) {
150
+ dom.setAttrib(a, 'tabindex', '-1');
151
+ });
152
+
153
+ keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
154
+ root: tabContainerElm,
155
+ items: items,
156
+ onAction: action,
157
+ actOnFocus: true,
158
+ enableLeftRight: true,
159
+ enableUpDown: true
160
+ }, tinyMCEPopup.dom);
161
+ });
162
+ });