mokio 0.0.8 → 0.0.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (101) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/ui-bg_glass_55_9fc569_1x400.png +915 -0
  3. data/app/assets/stylesheets/backend/plugins/forms/select2/{select2.css → select2.css.scss} +10 -10
  4. data/app/assets/stylesheets/backend/supr-theme/{jquery-ui-timepicker-addon.css → jquery-ui-timepicker-addon.css.scss} +1 -1
  5. data/app/assets/stylesheets/backend/supr-theme/{jquery.ui.datepicker.css → jquery.ui.datepicker.css.scss} +76 -76
  6. data/app/assets/stylesheets/backend/supr-theme/jquery.ui.supr.css.scss +1 -1
  7. data/app/assets/stylesheets/backend/supr-theme/jquery.ui.theme.css.scss +2 -2
  8. data/app/datatables/commons_datatable.rb +6 -5
  9. data/app/views/mokio/articles/_form.html.slim +14 -15
  10. data/app/views/mokio/backend/common/_form_content.html.haml +1 -1
  11. data/app/views/mokio/backend/contacts/_form.html.haml +1 -1
  12. data/app/views/mokio/backend/dashboard/show.html.haml +14 -14
  13. data/app/views/mokio/contacts/_form.html.slim +11 -12
  14. data/app/views/mokio/external_scripts/_form.html.slim +2 -3
  15. data/app/views/mokio/langs/_form.html.slim +3 -4
  16. data/app/views/mokio/menus/_form.html.haml +2 -1
  17. data/app/views/mokio/module_positions/_form.html.slim +2 -3
  18. data/app/views/mokio/mov_galleries/_form_inputs.html.slim +14 -15
  19. data/app/views/mokio/pic_galleries/_form_inputs.html.slim +14 -15
  20. data/app/views/mokio/static_modules/_form.html.slim +9 -10
  21. data/app/views/mokio/users/_form.html.slim +11 -12
  22. data/config/locales/en.yml +29 -26
  23. data/config/locales/pl.yml +27 -24
  24. data/lib/mokio/frontend_helpers/menu_helper.rb +1 -1
  25. data/lib/mokio/version.rb +1 -1
  26. metadata +6 -89
  27. data/app/views/mokio_haml/articles/_form.html.haml +0 -9
  28. data/app/views/mokio_haml/common/_form_content.html.haml +0 -36
  29. data/app/views/mokio_haml/common/_gmap.html.haml +0 -39
  30. data/app/views/mokio_haml/common/_main_pic.html.haml +0 -4
  31. data/app/views/mokio_haml/common/_meta.html.haml +0 -51
  32. data/app/views/mokio_haml/common/_notice.html.haml +0 -3
  33. data/app/views/mokio_haml/common/_obj.html.haml +0 -16
  34. data/app/views/mokio_haml/common/copy.html.haml +0 -5
  35. data/app/views/mokio_haml/common/edit.html.haml +0 -6
  36. data/app/views/mokio_haml/common/index.html.haml +0 -19
  37. data/app/views/mokio_haml/common/new.html.haml +0 -6
  38. data/app/views/mokio_haml/contacts/_form.html.haml +0 -42
  39. data/app/views/mokio_haml/contents/_content_info_widget.html.haml +0 -22
  40. data/app/views/mokio_haml/dashboard/_content.html.haml +0 -9
  41. data/app/views/mokio_haml/dashboard/show.html.haml +0 -35
  42. data/app/views/mokio_haml/dashboard/tbl_content.html.haml +0 -24
  43. data/app/views/mokio_haml/data_files/_file_upload.html.erb +0 -71
  44. data/app/views/mokio_haml/data_files/uploader.html.haml +0 -15
  45. data/app/views/mokio_haml/default_mailer/msg.html.haml +0 -6
  46. data/app/views/mokio_haml/errors/404.html.haml +0 -45
  47. data/app/views/mokio_haml/errors/unauthorized.html.haml +0 -11
  48. data/app/views/mokio_haml/layout/_user_widget.html.haml +0 -8
  49. data/app/views/mokio_haml/layout/header.html.haml +0 -14
  50. data/app/views/mokio_haml/layout/sidebar.html.haml +0 -59
  51. data/app/views/mokio_haml/menus/_form.html.haml +0 -75
  52. data/app/views/mokio_haml/menus/_menu.html.haml +0 -24
  53. data/app/views/mokio_haml/menus/index.html.haml +0 -53
  54. data/app/views/mokio_haml/menus/index.json.jbuilder +0 -4
  55. data/app/views/mokio_haml/menus/lang_changed.js.haml +0 -6
  56. data/app/views/mokio_haml/menus/sort.html.haml +0 -1
  57. data/app/views/mokio_haml/menus/update_menu_breadcrumps.js.haml +0 -1
  58. data/app/views/mokio_haml/mov_galleries/_form.html.haml +0 -17
  59. data/app/views/mokio_haml/mov_galleries/_form_inputs.html.haml +0 -8
  60. data/app/views/mokio_haml/photos/_gallery.html.haml +0 -25
  61. data/app/views/mokio_haml/photos/create.js.haml +0 -1
  62. data/app/views/mokio_haml/photos/crop_photo.js.haml +0 -10
  63. data/app/views/mokio_haml/photos/crop_thumb.js.haml +0 -11
  64. data/app/views/mokio_haml/photos/destroy.js.haml +0 -1
  65. data/app/views/mokio_haml/photos/from_external_link.html.haml +0 -19
  66. data/app/views/mokio_haml/photos/get_photo.js.haml +0 -1
  67. data/app/views/mokio_haml/photos/get_thumb.js.haml +0 -1
  68. data/app/views/mokio_haml/photos/photo.html.haml +0 -54
  69. data/app/views/mokio_haml/photos/remove_thumb.js.haml +0 -10
  70. data/app/views/mokio_haml/photos/rotate_photo.js.haml +0 -10
  71. data/app/views/mokio_haml/photos/rotate_thumb.js.haml +0 -11
  72. data/app/views/mokio_haml/photos/thumb.html.haml +0 -9
  73. data/app/views/mokio_haml/photos/update_thumb.js.haml +0 -11
  74. data/app/views/mokio_haml/photos/upload_external_links.js.haml +0 -4
  75. data/app/views/mokio_haml/pic_galleries/_form.html.haml +0 -16
  76. data/app/views/mokio_haml/pic_galleries/_form_inputs.html.haml +0 -9
  77. data/app/views/mokio_haml/site_helper/first_login.html.haml +0 -14
  78. data/app/views/mokio_haml/static_modules/_form.html.haml +0 -9
  79. data/app/views/mokio_haml/users/_form.html.haml +0 -11
  80. data/app/views/mokio_haml/users/edit_password.html.haml +0 -13
  81. data/app/views/mokio_haml/youtubes/_edit.html.haml +0 -49
  82. data/app/views/mokio_haml/youtubes/_gallery.html.haml +0 -24
  83. data/app/views/mokio_haml/youtubes/_new.html.haml +0 -4
  84. data/app/views/mokio_haml/youtubes/_preview_movie.html.haml +0 -1
  85. data/app/views/mokio_haml/youtubes/_search_yt.html.haml +0 -8
  86. data/app/views/mokio_haml/youtubes/_search_yt_body.html.haml +0 -11
  87. data/app/views/mokio_haml/youtubes/find.js.haml +0 -1
  88. data/app/views/mokio_haml/youtubes/preview.html.haml +0 -36
  89. data/app/views/mokio_haml/youtubes/preview_movie.js.haml +0 -5
  90. data/app/views/mokio_haml/youtubes/thumb.html.haml +0 -14
  91. data/app/views/mokio_haml/youtubes/uploader.html.haml +0 -10
  92. data/app/views/mokio_haml/youtubes/youtube.html.haml +0 -12
  93. data/spec/dummy/config/database.yml +0 -37
  94. data/spec/dummy/db/migrate/20140819120200_add_mokio_to_application.mokio.rb +0 -230
  95. data/spec/dummy/db/migrate/20140829082940_create_mokio_external_scripts.mokio.rb +0 -11
  96. data/spec/dummy/db/migrate/20141016113202_alter_external_scripts.mokio.rb +0 -14
  97. data/spec/dummy/db/schema.rb +0 -323
  98. data/spec/dummy/log/development.log +0 -119825
  99. data/spec/dummy/log/development_mokio.log +0 -14177
  100. data/spec/dummy/log/production.log +0 -8400
  101. data/spec/dummy/log/production_mokio.log +0 -374
@@ -1,17 +1,16 @@
1
- - cache [:form, obj] do
2
- = render :partial => "mokio/common/main_pic", locals: {f:f}
3
- = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]}, include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
4
- = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
5
- = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
6
- = f.input :title, disabled: !obj.display_editable_field?('title')
7
- = f.input :intro, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
8
- = f.input :content, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 300} }, disabled: !obj.display_editable_field?('content')
1
+ = render :partial => "mokio/common/main_pic", locals: {f:f}
2
+ = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]}, include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
3
+ = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
4
+ = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
5
+ = f.input :title, disabled: !obj.display_editable_field?('title')
6
+ = f.input :intro, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
7
+ = f.input :content, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 300} }, disabled: !obj.display_editable_field?('content')
9
8
 
10
- = f.input :display_from, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) }, disabled: !obj.display_editable_field?('display_from')
11
- = f.input :display_to, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) }, disabled: !obj.display_editable_field?('display_to')
12
- .row-fluid
13
- label.form-label.span2
14
- = t('menus.content_assoc')
15
- .span10
16
- =collection_select(:pic_gallery, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
9
+ = f.input :display_from, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) }, disabled: !obj.display_editable_field?('display_from')
10
+ = f.input :display_to, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) }, disabled: !obj.display_editable_field?('display_to')
11
+ .row-fluid
12
+ label.form-label.span2
13
+ = t('menus.content_assoc')
14
+ .span10
15
+ =collection_select(:pic_gallery, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
17
16
 
@@ -1,10 +1,9 @@
1
- - cache [:form, obj] do
2
- = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]}, include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
3
- = f.input :active, :wrapper => :active_checkbox, disabled: !@static_module.display_editable_field?('active')
4
- = f.input :title, disabled: !@static_module.display_editable_field?('title')
5
- = f.input :intro, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !@static_module.display_editable_field?('intro')
6
- = f.input :content, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !@static_module.display_editable_field?('content')
7
- = f.association :module_positions, :wrapper => :checkbox, :as => :check_boxes, disabled: !@static_module.display_editable_field?('module_positions')
8
- = f.input :always_displayed, :wrapper => :active_checkbox, disabled: !@static_module.display_editable_field?('always_displayed')
9
- = f.input :display_from, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) }, disabled: !@static_module.display_editable_field?('display_from')
10
- = f.input :display_to, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) }, disabled: !@static_module.display_editable_field?('display_to')
1
+ = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]}, include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
2
+ = f.input :active, :wrapper => :active_checkbox, disabled: !@static_module.display_editable_field?('active')
3
+ = f.input :title, disabled: !@static_module.display_editable_field?('title')
4
+ = f.input :intro, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !@static_module.display_editable_field?('intro')
5
+ = f.input :content, :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !@static_module.display_editable_field?('content')
6
+ = f.association :module_positions, :wrapper => :checkbox, :as => :check_boxes, disabled: !@static_module.display_editable_field?('module_positions')
7
+ = f.input :always_displayed, :wrapper => :active_checkbox, disabled: !@static_module.display_editable_field?('always_displayed')
8
+ = f.input :display_from, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) }, disabled: !@static_module.display_editable_field?('display_from')
9
+ = f.input :display_to, :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) }, disabled: !@static_module.display_editable_field?('display_to')
@@ -1,12 +1,11 @@
1
- - cache [:form, obj] do
2
- .form-inputs
3
- - unless @password_only
4
- = f.input :email, required: true, :wrapper => :input_span
5
- = f.input :password, :wrapper => :input_span
6
- = f.input :password_confirmation, :wrapper => :input_span
7
- - unless @password_only
8
- - for role in Mokio::User::ROLES
9
- = check_box_tag "user[roles][#{role}]", role, @user.has_role?(role), {:name => "user[roles][]"}
10
- = label_tag "user_roles_#{role}", bt("role_name." + role, Mokio::User)
11
- br/
12
- = hidden_field_tag "user[roles][]", ""
1
+ .form-inputs
2
+ - unless @password_only
3
+ = f.input :email, required: true, :wrapper => :input_span
4
+ = f.input :password, :wrapper => :input_span
5
+ = f.input :password_confirmation, :wrapper => :input_span
6
+ - unless @password_only
7
+ - for role in Mokio::User::ROLES
8
+ = check_box_tag "user[roles][#{role}]", role, @user.has_role?(role), {:name => "user[roles][]"}
9
+ = label_tag "user_roles_#{role}", bt("role_name." + role, Mokio::User)
10
+ br/
11
+ = hidden_field_tag "user[roles][]", ""
@@ -126,7 +126,7 @@ en:
126
126
  mov_gallery: Movie Galleries
127
127
  contact: Contact Pages
128
128
  menu: Menu
129
- static_module: HTML Blocks
129
+ static_module: Reusable Blocks
130
130
  module_position: Positions
131
131
  external_script: External script
132
132
  lang: Languages
@@ -140,9 +140,9 @@ en:
140
140
  menus: Menu management
141
141
  menus_edit: Edit menu element
142
142
  menus_new: New menu element
143
- static_modules: HTML blocks
144
- static_modules_edit: Edit HTML block
145
- static_modules_new: New HTML block
143
+ static_modules: Reusable blocks
144
+ static_modules_edit: Edit Reusable block
145
+ static_modules_new: New Reusable block
146
146
  articles_new: New article
147
147
  articles_edit: Edit article
148
148
  pic_galleries_new: New photo gallery
@@ -185,22 +185,22 @@ en:
185
185
  static_modules:
186
186
  actions: Actions
187
187
  active: Active
188
- edit_title: Edit HTML block
189
- index_title: HTML blocks
190
- index_add_new: Add HTML block
188
+ edit_title: Edit Reusable block
189
+ index_title: Reusable blocks
190
+ index_add_new: Add Reusable block
191
191
  lang_id: Language
192
- new_title: New HTML block
192
+ new_title: New Reusable block
193
193
  position: Position
194
194
  title: Title
195
195
  module_position_ids: Position
196
196
  updated_at: Updated at
197
- edit_title: Edit HTML block
198
- created: "HTML block <strong>'%{title}'</strong> has been created"
199
- updated: "HTML block <strong>'%{title}'</strong> has been saved"
200
- deleted: "HTML block <strong>'%{title}'</strong> has been deleted"
201
- update_active_true: "HTML block <strong>'%{title}'</strong> is active"
202
- update_active_false: "HTML block <strong>'%{title}'</strong> is not active"
203
- copy_title: Copy HTML block
197
+ edit_title: Edit Reusable block
198
+ created: "Reusable block <strong>'%{title}'</strong> has been created"
199
+ updated: "Reusable block <strong>'%{title}'</strong> has been saved"
200
+ deleted: "Reusable block <strong>'%{title}'</strong> has been deleted"
201
+ update_active_true: "Reusable block <strong>'%{title}'</strong> is active"
202
+ update_active_false: "Reusable block <strong>'%{title}'</strong> is not active"
203
+ copy_title: Copy Reusable block
204
204
 
205
205
  external_scripts:
206
206
  name: Name / Id
@@ -306,17 +306,18 @@ en:
306
306
  sort_false: Not all changes in menu structure were allowed - please refresh the page.
307
307
  list: List
308
308
  content_remove_confirm: Would you like to remove from this menu all content from previously selected language?
309
- modules_remove_confirm: Would you like to remove from this menu all HTML blocks from previously selected language?
309
+ modules_remove_confirm: Would you like to remove from this menu all Reusable blocks from previously selected language?
310
310
  confirm: Do you really want to delete this menu item?
311
- menu_active_legend: "Active menu position - url works"
312
- menu_non_active_legend: "Inactive menu position - url doesn't work"
313
- menu_visible_legend: "Visible menu position"
314
- menu_non_visible_legend: "Invisible menu position"
315
- exclamation_legend: "Menu position without content or with content that is non-active or non-displayed - blank page appears when using this menu position."
311
+ menu_active_legend: "Active menu element - url works"
312
+ menu_non_active_legend: "Inactive menu element - url doesn't work"
313
+ menu_visible_legend: "Visible menu element"
314
+ menu_non_visible_legend: "Invisible menu element"
315
+ exclamation_legend: "Menu element without content or with content that is non-active or non-displayed - blank page appears when this menu element is clicked."
316
316
  path: Path
317
317
  legend: Legend
318
318
  type: Type
319
319
  filter: filter ...
320
+ blocks: "Reusable blocks"
320
321
 
321
322
  pic_galleries:
322
323
  active: Active
@@ -520,7 +521,7 @@ en:
520
521
  admin: Administrator
521
522
  content_editor: Content management
522
523
  menu_editor: Menu management
523
- static_module_editor: HTML block management
524
+ static_module_editor: Reusable blocks management
524
525
  user_editor: Admins management
525
526
  comment_approver: Comment approve
526
527
  reader: Reader
@@ -539,11 +540,11 @@ en:
539
540
  content_nav_title: Add content
540
541
  content_nav_text: "Add content to your site: article, photo galleries, movies, etc. Added content should be attached to any menu element if you want it to be displayed on your site."
541
542
  menu_nav_title: Menu management
542
- menu_nav_text: "Add menu elements and attach content to menu. You can also add HTML blocks to given position on given subpage (one, some or all)."
543
- static_module_nav_title: HTML blocks
544
- static_module_nav_text: "Add HTML blocks, so pieces of script that should be displayed in various places of one, many or all of the subpages."
543
+ menu_nav_text: "Add menu elements and attach content to menu. You can also add Reusable blocks to given position on given subpage (one, some or all)."
544
+ static_module_nav_title: Reusable blocks
545
+ static_module_nav_text: "Add Reusable blocks, so pieces of HTML that should be displayed in various places of one, many or all of the subpages."
545
546
  module_position_nav_title: Positions
546
- module_position_nav_text: Add a position that later can be user for putting HTML block or menu on the page.
547
+ module_position_nav_text: Add a position that later can be user for putting Reusable block or menu on the page.
547
548
  external_script_nav_title: External script
548
549
  external_script_nav_text: Add custom javascript to your page.
549
550
  user_nav_title: Admins management
@@ -629,6 +630,8 @@ en:
629
630
  attributes:
630
631
  name:
631
632
  blank: "Name cannot be blank"
633
+ script:
634
+ blank: "Script cannot be blank"
632
635
  mokio/module_position:
633
636
  attributes:
634
637
  name:
@@ -140,9 +140,9 @@ pl:
140
140
  menus: Zarządzanie menu
141
141
  menus_edit: Edycja elementu menu
142
142
  menus_new: Nowy element menu
143
- static_modules: Bloki HTML
144
- static_modules_edit: Edycja bloku HTML
145
- static_modules_new: Nowy blok HTML
143
+ static_modules: Bloki
144
+ static_modules_edit: Edycja bloku
145
+ static_modules_new: Nowy blok
146
146
  articles_new: Nowy artykuł
147
147
  articles_edit: Edycja artykułu
148
148
  pic_galleries_new: Nowa galeria zdjęć
@@ -185,22 +185,22 @@ pl:
185
185
  static_modules:
186
186
  actions: Akcje
187
187
  active: Włączony
188
- edit_title: Edytuj blok HTML
189
- index_title: Bloki HTML
190
- index_add_new: Dodaj nowy blok HTML
188
+ edit_title: Edytuj blok
189
+ index_title: Bloki
190
+ index_add_new: Dodaj nowy blok
191
191
  lang_id: Język
192
- new_title: Nowy blok HTML
192
+ new_title: Nowy blok
193
193
  position: Pozycja
194
194
  title: Tytuł
195
195
  module_position_ids: Pozycje
196
196
  updated_at: Uaktualniono
197
- edit_title: Edytuj blok HTML
198
- created: "Blok HTML <strong>'%{title}'</strong> został utworzony."
199
- updated: "Blok HTML <strong>'%{title}'</strong> został poprawnie edytowany."
200
- deleted: "Blok HTML <strong>'%{title}'</strong> został usunięty."
201
- update_active_true: "Blok HTML <strong>'%{title}'</strong> jest teraz aktywny."
202
- update_active_false: "Blok HTML <strong>'%{title}'</strong> jest teraz nieaktywny."
203
- copy_title: Kopiuj blok HTML
197
+ edit_title: Edytuj blok
198
+ created: "Blok <strong>'%{title}'</strong> został utworzony."
199
+ updated: "Blok <strong>'%{title}'</strong> został poprawnie edytowany."
200
+ deleted: "Blok <strong>'%{title}'</strong> został usunięty."
201
+ update_active_true: "Blok <strong>'%{title}'</strong> jest teraz aktywny."
202
+ update_active_false: "Blok <strong>'%{title}'</strong> jest teraz nieaktywny."
203
+ copy_title: Kopiuj blok
204
204
 
205
205
  external_scripts:
206
206
  name: Nazwa / id
@@ -308,15 +308,16 @@ pl:
308
308
  content_remove_confirm: Czy chcesz odłączyć od menu wszystkie treści z innego języka niż nowowybrany?
309
309
  modules_remove_confirm: Czy chcesz odłączyć wszystkie bloki HTML z innego języka niż nowowybrany?
310
310
  confirm: Czy na pewno chcesz skasować ten element menu?
311
- menu_active_legend: "Aktywna pozycja menu - link działa"
312
- menu_non_active_legend: "Nieaktywna pozycja menu - link nie działa"
313
- menu_visible_legend: "Wyświetlana pozycja menu"
314
- menu_non_visible_legend: "Niewyświetlana pozycja menu"
315
- exclamation_legend: "Pozycja menu bez podłączonej treści lub z podłączoną treścią, która jest nieaktywna bądź nie jest aktualnie wyświetlana - po wejściu na niniejszą zakładkę zostanie wyświetlona pusta strona"
311
+ menu_active_legend: "Aktywny element menu - link działa"
312
+ menu_non_active_legend: "Nieaktywny element menu - link nie działa"
313
+ menu_visible_legend: "Wyświetlany element menu"
314
+ menu_non_visible_legend: "Niewyświetlany element menu"
315
+ exclamation_legend: "Element menu bez podłączonej treści lub z podłączoną treścią, która jest nieaktywna bądź nie jest aktualnie wyświetlana - po wejściu na niniejszą zakładkę zostanie wyświetlona pusta strona"
316
316
  path: Ścieżka
317
317
  legend: Legenda
318
318
  type: Typ
319
319
  filter: wyszukaj treść ...
320
+ blocks: Bloki
320
321
 
321
322
  pic_galleries:
322
323
  active: Włączona
@@ -520,7 +521,7 @@ pl:
520
521
  admin: Administrator
521
522
  content_editor: Zarządzanie treścią
522
523
  menu_editor: Zarządzanie strukturą menu
523
- static_module_editor: Zarządzanie blokami HTML
524
+ static_module_editor: Zarządzanie blokami
524
525
  user_editor: Zarządzanie administratorami
525
526
  comment_approver: Obsługa komentarzy (moderowanie)
526
527
  reader: Dosŧęp do odczytu
@@ -539,11 +540,11 @@ pl:
539
540
  content_nav_title: Dodaj treść
540
541
  content_nav_text: "Dodawanie treści na stronę: artykuły, galerie zdjęć, filmów, itd. Dodane treści powinny zostać podpięte pod menu jeśli chcemy je wyświetlić na stronie."
541
542
  menu_nav_title: Zarządzanie menu
542
- menu_nav_text: "Dodawanie elementów menu i podpinanie pod nie treści, które mają być wyświetlone na danej podstronie. Do menu możemy również podpinać bloki HTML do wyświetlenia w odpowiednich pozycjach na stronie."
543
- static_module_nav_title: Bloki HTML
544
- static_module_nav_text: "Dodawanie bloków HTML, czyli kawałki kodu do wyświetlenia w różnych miejscach jednej, kilku lub wszystkich podstron."
543
+ menu_nav_text: "Dodawanie elementów menu i podpinanie pod nie treści, które mają być wyświetlone na danej podstronie. Do menu możemy również podpinać bloki do wyświetlenia w odpowiednich pozycjach na stronie."
544
+ static_module_nav_title: Bloki
545
+ static_module_nav_text: "Dodawanie bloków, czyli kawałki kodu do wyświetlenia w różnych miejscach jednej, kilku lub wszystkich podstron."
545
546
  module_position_nav_title: Pozycje
546
- module_position_nav_text: "Dodawanie pozycji, które później moga zostać wykorzystane do umieszczania bloków HTML lub menu na stronie."
547
+ module_position_nav_text: "Dodawanie pozycji, które później moga zostać wykorzystane do umieszczania bloków lub menu na stronie."
547
548
  external_script_nav_title: Skrypty zewnętrzne
548
549
  external_script_nav_text: Dodawanie własnego javascriptu do strony.
549
550
  user_nav_title: Zarządzanie administratorami
@@ -629,6 +630,8 @@ pl:
629
630
  attributes:
630
631
  name:
631
632
  blank: "Nazwa nie może być pusta"
633
+ script:
634
+ blank: "Skrypt nie może być pusty"
632
635
  mokio/module_position:
633
636
  attributes:
634
637
  name:
@@ -304,7 +304,7 @@ module Mokio
304
304
  #
305
305
  raise Exceptions::IsNotMenuRootError.new(:id, initial_id) if root.ancestry
306
306
  html = ""
307
- h do |item|
307
+ root.children.each do |item|
308
308
  html << build_items_with_css(item, limit, 1,css_c) if (item.name == position || item.id == position) && item.children.present? && item.active
309
309
  end
310
310
  html.html_safe
data/lib/mokio/version.rb CHANGED
@@ -2,5 +2,5 @@ module Mokio
2
2
  #
3
3
  # Actual Mokio version
4
4
  #
5
- VERSION = "0.0.8"
5
+ VERSION = "0.0.9"
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mokio
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - versoft
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-28 00:00:00.000000000 Z
11
+ date: 2014-11-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -1048,6 +1048,7 @@ files:
1048
1048
  - app/assets/images/backend/watermark.png.REMOTE.21617.png
1049
1049
  - app/assets/images/favicon.ico
1050
1050
  - app/assets/images/ui-bg_flat_75_ffffff_40x100.png
1051
+ - app/assets/images/ui-bg_glass_55_9fc569_1x400.png
1051
1052
  - app/assets/javascripts/backend.js
1052
1053
  - app/assets/javascripts/backend/bootstrap/bootstrap.js
1053
1054
  - app/assets/javascripts/backend/bootstrap/bootstrap.min.js
@@ -1187,7 +1188,7 @@ files:
1187
1188
  - app/assets/stylesheets/backend/plugins/forms/color-picker/marker.png
1188
1189
  - app/assets/stylesheets/backend/plugins/forms/color-picker/mask.png
1189
1190
  - app/assets/stylesheets/backend/plugins/forms/color-picker/wheel.png
1190
- - app/assets/stylesheets/backend/plugins/forms/select2/select2.css
1191
+ - app/assets/stylesheets/backend/plugins/forms/select2/select2.css.scss
1191
1192
  - app/assets/stylesheets/backend/plugins/forms/togglebutton/toggle-buttons.css
1192
1193
  - app/assets/stylesheets/backend/plugins/forms/uniform/checkbox.png
1193
1194
  - app/assets/stylesheets/backend/plugins/forms/uniform/choose-file.png
@@ -1232,11 +1233,11 @@ files:
1232
1233
  - app/assets/stylesheets/backend/supr-theme/images/ui-icons_353535_256x240.png
1233
1234
  - app/assets/stylesheets/backend/supr-theme/images/ui-icons_454545_256x240.png
1234
1235
  - app/assets/stylesheets/backend/supr-theme/images/ui-icons_ed7a53_256x240.png
1235
- - app/assets/stylesheets/backend/supr-theme/jquery-ui-timepicker-addon.css
1236
+ - app/assets/stylesheets/backend/supr-theme/jquery-ui-timepicker-addon.css.scss
1236
1237
  - app/assets/stylesheets/backend/supr-theme/jquery.ui.autocomplete.css
1237
1238
  - app/assets/stylesheets/backend/supr-theme/jquery.ui.combobox.css
1238
1239
  - app/assets/stylesheets/backend/supr-theme/jquery.ui.core.css
1239
- - app/assets/stylesheets/backend/supr-theme/jquery.ui.datepicker.css
1240
+ - app/assets/stylesheets/backend/supr-theme/jquery.ui.datepicker.css.scss
1240
1241
  - app/assets/stylesheets/backend/supr-theme/jquery.ui.dialog.css
1241
1242
  - app/assets/stylesheets/backend/supr-theme/jquery.ui.progressbar.css
1242
1243
  - app/assets/stylesheets/backend/supr-theme/jquery.ui.resizable.css
@@ -1450,72 +1451,6 @@ files:
1450
1451
  - app/views/mokio/youtubes/thumb.html.slim
1451
1452
  - app/views/mokio/youtubes/uploader.html.slim
1452
1453
  - app/views/mokio/youtubes/youtube.html.slim
1453
- - app/views/mokio_haml/articles/_form.html.haml
1454
- - app/views/mokio_haml/common/_form_content.html.haml
1455
- - app/views/mokio_haml/common/_gmap.html.haml
1456
- - app/views/mokio_haml/common/_main_pic.html.haml
1457
- - app/views/mokio_haml/common/_meta.html.haml
1458
- - app/views/mokio_haml/common/_notice.html.haml
1459
- - app/views/mokio_haml/common/_obj.html.haml
1460
- - app/views/mokio_haml/common/copy.html.haml
1461
- - app/views/mokio_haml/common/edit.html.haml
1462
- - app/views/mokio_haml/common/index.html.haml
1463
- - app/views/mokio_haml/common/new.html.haml
1464
- - app/views/mokio_haml/contacts/_form.html.haml
1465
- - app/views/mokio_haml/contents/_content_info_widget.html.haml
1466
- - app/views/mokio_haml/dashboard/_content.html.haml
1467
- - app/views/mokio_haml/dashboard/show.html.haml
1468
- - app/views/mokio_haml/dashboard/tbl_content.html.haml
1469
- - app/views/mokio_haml/data_files/_file_upload.html.erb
1470
- - app/views/mokio_haml/data_files/uploader.html.haml
1471
- - app/views/mokio_haml/default_mailer/msg.html.haml
1472
- - app/views/mokio_haml/errors/404.html.haml
1473
- - app/views/mokio_haml/errors/unauthorized.html.haml
1474
- - app/views/mokio_haml/layout/_user_widget.html.haml
1475
- - app/views/mokio_haml/layout/header.html.haml
1476
- - app/views/mokio_haml/layout/sidebar.html.haml
1477
- - app/views/mokio_haml/menus/_form.html.haml
1478
- - app/views/mokio_haml/menus/_menu.html.haml
1479
- - app/views/mokio_haml/menus/index.html.haml
1480
- - app/views/mokio_haml/menus/index.json.jbuilder
1481
- - app/views/mokio_haml/menus/lang_changed.js.haml
1482
- - app/views/mokio_haml/menus/sort.html.haml
1483
- - app/views/mokio_haml/menus/update_menu_breadcrumps.js.haml
1484
- - app/views/mokio_haml/mov_galleries/_form.html.haml
1485
- - app/views/mokio_haml/mov_galleries/_form_inputs.html.haml
1486
- - app/views/mokio_haml/photos/_gallery.html.haml
1487
- - app/views/mokio_haml/photos/create.js.haml
1488
- - app/views/mokio_haml/photos/crop_photo.js.haml
1489
- - app/views/mokio_haml/photos/crop_thumb.js.haml
1490
- - app/views/mokio_haml/photos/destroy.js.haml
1491
- - app/views/mokio_haml/photos/from_external_link.html.haml
1492
- - app/views/mokio_haml/photos/get_photo.js.haml
1493
- - app/views/mokio_haml/photos/get_thumb.js.haml
1494
- - app/views/mokio_haml/photos/photo.html.haml
1495
- - app/views/mokio_haml/photos/remove_thumb.js.haml
1496
- - app/views/mokio_haml/photos/rotate_photo.js.haml
1497
- - app/views/mokio_haml/photos/rotate_thumb.js.haml
1498
- - app/views/mokio_haml/photos/thumb.html.haml
1499
- - app/views/mokio_haml/photos/update_thumb.js.haml
1500
- - app/views/mokio_haml/photos/upload_external_links.js.haml
1501
- - app/views/mokio_haml/pic_galleries/_form.html.haml
1502
- - app/views/mokio_haml/pic_galleries/_form_inputs.html.haml
1503
- - app/views/mokio_haml/site_helper/first_login.html.haml
1504
- - app/views/mokio_haml/static_modules/_form.html.haml
1505
- - app/views/mokio_haml/users/_form.html.haml
1506
- - app/views/mokio_haml/users/edit_password.html.haml
1507
- - app/views/mokio_haml/youtubes/_edit.html.haml
1508
- - app/views/mokio_haml/youtubes/_gallery.html.haml
1509
- - app/views/mokio_haml/youtubes/_new.html.haml
1510
- - app/views/mokio_haml/youtubes/_preview_movie.html.haml
1511
- - app/views/mokio_haml/youtubes/_search_yt.html.haml
1512
- - app/views/mokio_haml/youtubes/_search_yt_body.html.haml
1513
- - app/views/mokio_haml/youtubes/find.js.haml
1514
- - app/views/mokio_haml/youtubes/preview.html.haml
1515
- - app/views/mokio_haml/youtubes/preview_movie.js.haml
1516
- - app/views/mokio_haml/youtubes/thumb.html.haml
1517
- - app/views/mokio_haml/youtubes/uploader.html.haml
1518
- - app/views/mokio_haml/youtubes/youtube.html.haml
1519
1454
  - config/initializers/ckeditor.rb
1520
1455
  - config/initializers/devise.rb
1521
1456
  - config/initializers/friendly_id.rb
@@ -1622,7 +1557,6 @@ files:
1622
1557
  - spec/dummy/config.ru
1623
1558
  - spec/dummy/config/application.rb
1624
1559
  - spec/dummy/config/boot.rb
1625
- - spec/dummy/config/database.yml
1626
1560
  - spec/dummy/config/database.yml.example
1627
1561
  - spec/dummy/config/environment.rb
1628
1562
  - spec/dummy/config/environments/development.rb
@@ -1640,14 +1574,6 @@ files:
1640
1574
  - spec/dummy/config/menu.yml.example
1641
1575
  - spec/dummy/config/routes.rb
1642
1576
  - spec/dummy/config/views.yml
1643
- - spec/dummy/db/migrate/20140819120200_add_mokio_to_application.mokio.rb
1644
- - spec/dummy/db/migrate/20140829082940_create_mokio_external_scripts.mokio.rb
1645
- - spec/dummy/db/migrate/20141016113202_alter_external_scripts.mokio.rb
1646
- - spec/dummy/db/schema.rb
1647
- - spec/dummy/log/development.log
1648
- - spec/dummy/log/development_mokio.log
1649
- - spec/dummy/log/production.log
1650
- - spec/dummy/log/production_mokio.log
1651
1577
  - spec/dummy/public/404.html
1652
1578
  - spec/dummy/public/422.html
1653
1579
  - spec/dummy/public/500.html
@@ -1761,10 +1687,6 @@ test_files:
1761
1687
  - spec/factories/recipients.rb
1762
1688
  - spec/integration/navigation_test.rb
1763
1689
  - spec/fixtures/files/sample_image.jpg
1764
- - spec/dummy/log/production.log
1765
- - spec/dummy/log/development.log
1766
- - spec/dummy/log/development_mokio.log
1767
- - spec/dummy/log/production_mokio.log
1768
1690
  - spec/dummy/app/helpers/application_helper.rb
1769
1691
  - spec/dummy/app/controllers/application_controller.rb
1770
1692
  - spec/dummy/app/views/layouts/application.html.erb
@@ -1776,13 +1698,8 @@ test_files:
1776
1698
  - spec/dummy/public/422.html
1777
1699
  - spec/dummy/Rakefile
1778
1700
  - spec/dummy/README.rdoc
1779
- - spec/dummy/db/schema.rb
1780
- - spec/dummy/db/migrate/20140819120200_add_mokio_to_application.mokio.rb
1781
- - spec/dummy/db/migrate/20140829082940_create_mokio_external_scripts.mokio.rb
1782
- - spec/dummy/db/migrate/20141016113202_alter_external_scripts.mokio.rb
1783
1701
  - spec/dummy/config/database.yml.example
1784
1702
  - spec/dummy/config/environment.rb
1785
- - spec/dummy/config/database.yml
1786
1703
  - spec/dummy/config/views.yml
1787
1704
  - spec/dummy/config/application.rb
1788
1705
  - spec/dummy/config/environments/development.rb