Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes to VO usability

  • Loading branch information...
commit 70e1ee0dcff22d00d8699bf665df87d1ad78c724 1 parent 59ef24e
adahmash adahmash authored
2  app/controllers/admin/widgets_controller.rb
View
@@ -43,7 +43,7 @@ def newer_widgets
{ :name => 'media', :regex => /image|video|galler(y|ies)/i },
{ :name => 'users', :regex => /user|welcome panel?/i },
{ :name => 'ads', :regex => /\bad[s_\. ]/i },
- { :name => 'misc', :regex => /.+/i }
+ { :name => 'universal', :regex => /.+/i }
]
@page = ViewObject.find_by_name("home--index")
@view_objects = ViewObject.find(:all, :conditions => ["view_object_template_id is not null"])
10 app/views/admin/view_objects/edit.html.haml
View
@@ -58,7 +58,7 @@
-# link_to 'Return to View Objects index', admin_view_objects_path, :class=>"admin-btn"
-#%button#save-button.admin-btn.float-right{:type => "button"} Update Template Settings
- %h2 Update View Object
+ %h2 Update Widget
- if @view_object_setting.errors.any?
%h3{:style => "color: red"} Please clear the following errors and try again.
%ul
@@ -74,13 +74,13 @@
= field_set_tag nil, :class => 'inputs' do
%ol
%li.input.string
- = label_tag 'view_object_setting[locale_title]', 'Locale Title', :class => "label"
+ = label_tag 'view_object_setting[locale_title]', 'Locale Title*', :class => "label"
= text_field_tag 'view_object_setting[locale_title]', @view_object_setting.locale_title
%li.input.string
- = label_tag 'view_object_setting[locale_subtitle]', 'Locale Subtitle', :class => "label"
+ = label_tag 'view_object_setting[locale_subtitle]', 'Locale Subtitle*', :class => "label"
= text_field_tag 'view_object_setting[locale_subtitle]', @view_object_setting.locale_subtitle
%li.input.string
- = label_tag 'view_object_setting[klass_name]', 'Model Resource', :class => "label"
+ = label_tag 'view_object_setting[klass_name]', 'Model Resource*', :class => "label"
= select_tag 'view_object_setting[klass_name]', options_for_select(select_view_object_class_options, @view_object_setting.klass_name)
- kommand = @view_object_setting.kommands.first
- klass = @view_object_setting.get_klass
@@ -104,4 +104,4 @@
= field_set_tag nil, :class => 'buttons' do
%ol
%li
- = submit_tag "Update View Object"
+ = submit_tag "Update Widget"
14 app/views/admin/view_objects/new.html.haml
View
@@ -58,7 +58,7 @@
-# link_to 'Return to View Objects index', admin_view_objects_path, :class=>"admin-btn"
-#%button#save-button.admin-btn.float-right{:type => "button"} Update Template Settings
- %h2 Create View Object
+ %h2 Create Widget
- if @view_object_setting.errors.any?
%h3{:style => "color: red"} Please clear the following errors and try again.
%ul
@@ -74,19 +74,19 @@
= field_set_tag nil, :class => 'inputs' do
%ol
%li.input.string
- = label_tag 'view_object[key_name]', 'View Object Name', :class => "label"
+ = label_tag 'view_object[key_name]', 'Widget Name*', :class => "label"
= text_field_tag 'view_object[key_name]', @view_object.name
%li.input.string
- = label_tag 'view_object_setting[locale_title]', 'Locale Title', :class => "label"
+ = label_tag 'view_object_setting[locale_title]', 'Locale Title*', :class => "label"
= text_field_tag 'view_object_setting[locale_title]', @view_object_setting.locale_title
%li.input.string
- = label_tag 'view_object_setting[locale_subtitle]', 'Locale Subtitle', :class => "label"
+ = label_tag 'view_object_setting[locale_subtitle]', 'Locale Subtitle*', :class => "label"
= text_field_tag 'view_object_setting[locale_subtitle]', @view_object_setting.locale_subtitle
%li.input.string
- = label_tag 'view_object[view_object_template_id]', 'View Object Template', :class => "label"
+ = label_tag 'view_object[view_object_template_id]', 'Template*', :class => "label"
= select_tag 'view_object[view_object_template_id]', options_for_select(select_view_object_template_options, @view_object.view_object_template_id)
%li.input.string
- = label_tag 'view_object_setting[klass_name]', 'Model Resource', :class => "label"
+ = label_tag 'view_object_setting[klass_name]', 'Model Resource*', :class => "label"
= select_tag 'view_object_setting[klass_name]', options_for_select(select_view_object_class_options, @view_object_setting.klass_name)
- kommand = @view_object_setting.kommands.first
- klass = @view_object_setting.get_klass
@@ -110,4 +110,4 @@
= field_set_tag nil, :class => 'buttons' do
%ol
%li
- = submit_tag "Create View Object"
+ = submit_tag "Create Widget"
1  app/views/admin/widgets/newer_widgets.html.haml
View
@@ -161,6 +161,7 @@
#admin-actions
%a#save-button.admin-btn.float-right{:type => "button"} Save your layout
%a#clear-button.admin-btn{:type => "button"} Clear Widgets
+ = link_to 'Manage Widgets', admin_view_objects_path
-#%a#preview-button.admin-btn{:href => "/home/preview_widgets", :target => "_preview", :type => "button"} Preview Widgets
-##widget-tabs.ui-widget.ui-widget-content.ui-corner-all
Please sign in to comment.
Something went wrong with that request. Please try again.