From c64eac3f15dc5ae44127a846d292b0013b84eb14 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 13 Oct 2017 17:09:18 +0630 Subject: [PATCH] update admin bsb --- .../menu_item_instances/_form.html.erb | 62 ++++++++++------- .../menu_item_instances/edit.html.erb | 1 + .../settings/menu_item_instances/new.html.erb | 1 + .../menu_item_instances/show.html.erb | 33 ++++++++-- .../settings/menu_item_options/_form.html.erb | 37 +++++++---- .../settings/menu_item_options/edit.html.erb | 21 +++--- .../settings/menu_item_options/index.html.erb | 14 +++- .../settings/menu_item_options/new.html.erb | 14 ++-- .../settings/menu_item_sets/_form.html.erb | 36 +++++++--- .../settings/menu_item_sets/edit.html.erb | 15 +++-- .../settings/menu_item_sets/index.html.erb | 66 +++++++++++++------ .../settings/menu_item_sets/new.html.erb | 15 +++-- .../settings/menu_item_sets/show.html.erb | 38 +++++++---- app/views/settings/menus/index.html.erb | 6 +- 14 files changed, 246 insertions(+), 113 deletions(-) diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index c86ff780..90f0c43d 100644 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -1,35 +1,47 @@ +
+
-<%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %> + <%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %> - <%= f.error_notification %> + <%= f.error_notification %> -
-
- <%= f.input :item_instance_code %> - <%= f.input :item_instance_name %> - <%= f.input :price %> - - <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> - - <%= f.input :is_on_promotion %> - <%= f.input :promotion_price %> -
-
- -
-
+
- <%= f.input :is_available %> - <%= f.input :is_default %> + <%= f.input :item_instance_code %> + <%= f.input :item_instance_name %> + <%= f.input :price %> - <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> + <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %> + + <%= f.input :is_on_promotion %> + <%= f.input :promotion_price %>
-
- <%= f.button :submit %> +
+
+
+ <%= f.input :is_available %> + <%= f.input :is_default %> + + <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true }, :class => "form-control item_sets" %> +
+
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %>
-<% end %> - - +
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index 19f1799f..739be50f 100644 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -9,6 +9,7 @@
+
<%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %> diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index be231c83..55dc3ac5 100644 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -8,4 +8,5 @@
+
<%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %> diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 2fb1ca39..2eedbd81 100644 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -1,5 +1,5 @@ -
+ +
+
    +
  1. Home
    2. +
  2. Menu Item Instances
    3. +
  3. Detail
    4. + + <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> + +
-
+ +
+
+

Menu Item Instance

@@ -41,9 +54,9 @@ <%= @settings_menu_item_instances.is_default %> <%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if params[:simple_menu_item_id] %> - <%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %> + <% else %> - <%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %> + <% end %> @@ -51,5 +64,15 @@
- +
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb index 6cc46cbd..8803e47f 100644 --- a/app/views/settings/menu_item_options/_form.html.erb +++ b/app/views/settings/menu_item_options/_form.html.erb @@ -1,15 +1,28 @@ +
+
+ <%= simple_form_for([:settings, @settings_menu_item_option]) do |f| %> + <%= f.error_notification %> -<%= simple_form_for([:settings, @settings_menu_item_option]) do |f| %> - <%= f.error_notification %> +
+ <%= f.input :option_type %> + <%= f.input :name,:required => true %> + <%= f.input :value,:required => true %> -
- <%= f.input :option_type %> - <%= f.input :name %> - <%= f.input :value %> +
-
- -
- <%= f.button :submit %> -
-<% end %> +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %> +
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
\ No newline at end of file diff --git a/app/views/settings/menu_item_options/edit.html.erb b/app/views/settings/menu_item_options/edit.html.erb index 9c9da591..b038e3d9 100644 --- a/app/views/settings/menu_item_options/edit.html.erb +++ b/app/views/settings/menu_item_options/edit.html.erb @@ -1,12 +1,11 @@ - - -
-
- -
- <%= render 'form', settings_menu_item_option: @settings_menu_item_option %> +
+
    +
  1. Home
    2. +
  2. Menu Item Options
    3. +
  3. Edit
    4. + + <%= link_to 'Back', settings_menu_item_options_path %> + +
+<%= render 'form', settings_menu_item_option: @settings_menu_item_option %> diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index 0818f57b..8226d0c8 100644 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -1,6 +1,14 @@ - -
+
    +
  1. Home
    2. +
  2. Menu Category
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
+ +
diff --git a/app/views/settings/menu_item_options/new.html.erb b/app/views/settings/menu_item_options/new.html.erb index e9e8c061..b038e3d9 100644 --- a/app/views/settings/menu_item_options/new.html.erb +++ b/app/views/settings/menu_item_options/new.html.erb @@ -1,5 +1,11 @@ -

New Settings Menu Item Option

- +
+
    +
  1. Home
    2. +
  2. Menu Item Options
    3. +
  3. Edit
    4. + + <%= link_to 'Back', settings_menu_item_options_path %> + +
+
<%= render 'form', settings_menu_item_option: @settings_menu_item_option %> - -<%= link_to 'Back', settings_menu_item_options_path %> diff --git a/app/views/settings/menu_item_sets/_form.html.erb b/app/views/settings/menu_item_sets/_form.html.erb index c0d239b4..5eabad0b 100644 --- a/app/views/settings/menu_item_sets/_form.html.erb +++ b/app/views/settings/menu_item_sets/_form.html.erb @@ -1,12 +1,28 @@ -<%= simple_form_for([:settings,@settings_menu_item_set]) do |f| %> - <%= f.error_notification %> -
- <%= f.association :item_set %> - <%= f.association :menu_item %> -
-
- <%= f.button :submit,:class=>'btn btn-success' %> -
-<% end %> +
+
+ <%= simple_form_for([:settings,@settings_menu_item_set]) do |f| %> + <%= f.error_notification %> + +
+ <%= f.association :item_set %> + <%= f.association :menu_item %> +
+ +
+ <%= f.button :submit,:class=>'btn btn-success' %> +
+ <% end %> +
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
diff --git a/app/views/settings/menu_item_sets/edit.html.erb b/app/views/settings/menu_item_sets/edit.html.erb index ddd912ce..776c336f 100644 --- a/app/views/settings/menu_item_sets/edit.html.erb +++ b/app/views/settings/menu_item_sets/edit.html.erb @@ -1,5 +1,12 @@ -

Editing Settings Menu Item Set

-<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> - -<%= link_to 'Back', settings_menu_item_sets_path,:class => 'btn btn-danger' %> \ No newline at end of file +
+
    +
  1. Home
    2. +
  2. Menu Item Sets
    3. +
  3. Edit
    4. + + <%= link_to 'Back', settings_menu_item_sets_path %> + +
+
+<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> \ No newline at end of file diff --git a/app/views/settings/menu_item_sets/index.html.erb b/app/views/settings/menu_item_sets/index.html.erb index 0a2e50d2..fe10e6df 100644 --- a/app/views/settings/menu_item_sets/index.html.erb +++ b/app/views/settings/menu_item_sets/index.html.erb @@ -1,37 +1,63 @@
-
    -
  • Home
    • -
  • Menu Item Set
    • - - <%= link_to 'New Settings Menu Item Set', new_settings_menu_item_set_path ,:class=>'btn btn-primary btn-sm pull-right'%> -
+
    +
  1. Home
    2. +
  2. Menu Category
    3. + + <%= link_to 'Back', dashboard_path %> + +
- -
-
+
+
+
+
    +
  • <%= link_to 'Menu Categories', dashboard_path %>
    • +
  • <%= link_to 'Menu Item', dashboard_path %>
    • +
  • <%= link_to 'Item Set', dashboard_path %>
    • +
  • <%= link_to 'Simple Menu', dashboard_path %>
    • +
  • <%= link_to 'Set Menu', dashboard_path %>
    • +
+
+
+
+
+
+ <%= link_to 'New Settings Menu Item Set', new_settings_menu_item_set_path ,:class => 'btn btn-primary btn-lg float-right waves-effect"'%> +
- + - <% @settings_menu_item_sets.each do |item| %> - - - - + + + + - <% end %> - -
Item set Menu itemActions
<%= item.item_set.name %><%= item.menu_item.name %><%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> - <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> - <%= link_to 'Destroy', settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%>
<%= item.item_set.name %><%= item.menu_item.name %><%= link_to 'Show', settings_menu_item_set_path(item),:class=>'btn btn-sm btn-success' %> + <%= link_to 'Edit', edit_settings_menu_item_set_path(item),:class=>'btn btn-sm btn-primary' %> + <%= link_to 'Destroy', settings_menu_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%>
+ <% end %> + + +
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
diff --git a/app/views/settings/menu_item_sets/new.html.erb b/app/views/settings/menu_item_sets/new.html.erb index 259e7bed..e6731915 100644 --- a/app/views/settings/menu_item_sets/new.html.erb +++ b/app/views/settings/menu_item_sets/new.html.erb @@ -1,5 +1,12 @@ -

New Settings Menu Item Set

-<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> - -<%= link_to 'Back', settings_menu_item_sets_path,:class=>'btn btn-danger' %> +
+
    +
  1. Home
    2. +
  2. Menu Item Sets
    3. +
  3. New
    4. + + <%= link_to 'Back', settings_menu_item_sets_path %> + +
+
+<%= render 'form', settings_menu_item_set: @settings_menu_item_set %> \ No newline at end of file diff --git a/app/views/settings/menu_item_sets/show.html.erb b/app/views/settings/menu_item_sets/show.html.erb index a22b2cdb..458f00c5 100644 --- a/app/views/settings/menu_item_sets/show.html.erb +++ b/app/views/settings/menu_item_sets/show.html.erb @@ -1,14 +1,16 @@
- +
    +
  1. Home
    2. +
  2. Menu Item Sets
    3. +
  3. Details
    4. + + <%= link_to 'Back', settings_menu_item_sets_path %> + +
- -
+
+
+
@@ -26,7 +28,19 @@
- <%= link_to 'Edit', edit_settings_menu_item_set_path(@settings_menu_item_set),:class=>'btn btn-primary' %> - <%= link_to 'Back', settings_menu_item_sets_path,:class=>'btn btn-danger' %> -
+
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
+ + diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 9c1bc508..407bbe06 100644 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -42,15 +42,15 @@ <% @settings_menus.each do |settings_menu| %> - <%= link_to settings_menu.name, settings_menu_path(settings_menu),:class => 'btn btn-success btn-lg waves-effect' %> + <%= link_to settings_menu.name, settings_menu_path(settings_menu)%> <%= settings_menu.valid_days %> <%= settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %> <%= settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %> - <%= link_to 'Edit', edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-lg waves-effect' %> - <%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + <%= link_to 'Edit', edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %> + <%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %> <% end %>