update setting menu design

app/views/settings/set_menu_items/_form.html.erb

@@ -1,54 +1,70 @@
-<%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
-  <%= f.error_notification %>
-  
-  <div class="col-md-8 panel">
-    <div class="form-group">
-      <div class="col-md-6">
-        <%= f.input :item_code %>
-        <%= f.input :name %>
-        <%= f.input :alt_name %>
-        <%= f.input :type %>
-        <%= f.input :min_qty %>
-        <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> 
-      </div>    
-      <div class="col-md-6">
-        <%= f.input :is_available, :class => "form-control" %> 
 
-        <%= f.input :is_sub_item, :class => "form-control" %>
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
+    <%= f.error_notification %>
 
-        <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %>
-
-        <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true },  :class => "form-control item_attributes" %>
-
-        <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true },  :class => "form-control item_options" %>
-      </div>        
-    </div>
-  </div>
-
-  <div class="col-md-4">
-    <div class="panel padding-10">
+    <div class="col-md- panel">
       <div class="form-group">
-        <div class="menu-item-img">
-          <% if f.object.image_path? %>
+      <div class="col-md-">
+          <%= f.input :item_code %>
+          <%= f.input :name %>
+          <%= f.input :alt_name %>
+          <%= f.input :type %>
+          <%= f.input :min_qty %>
+          <%= f.input :account_id, :label => "Account type", :collection => Account.collection %> 
+        </div>    
+        <div class="col-md-">
+          <%= f.input :is_available, :class => "form-control" %> 
+
+          <%= f.input :is_sub_item, :class => "form-control" %>
+
+          <%= f.input :unit, :collection => Lookup.collection_of("unit") ,:class => "form-control" %>
+
+          <%= f.input :item_attributes, :collection => @item_attributes, :input_html => { :multiple => true },  :class => "form-control item_attributes" %>
+
+          <%= f.input :item_options, :collection => @item_options, :input_html => { :multiple => true },  :class => "form-control item_options" %>
+        </div>        
+      </div>
+    </div>
+
+    <div class="col-md-">
+      <div class="panel padding-10">
+        <div class="form-group">
+          <div class="menu-item-img">
+            <% if f.object.image_path? %>
             <p><%= f.object.name %></p>
             <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-          <% else %>
+            <% else %>
             <p>Menu Item Image</p>
             <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
-          <% end %>          
+            <% end %>          
+          </div>
+          <%= f.file_field :image_path, :class => "img-thumbnail" %>
         </div>
-        <%= f.file_field :image_path, :class => "img-thumbnail" %>
+      </div>
+
+      <div class="panel padding-10">
+        <div class="form-group">
+          <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true },  :class => "form-control item_sets" %>
+        </div>
+      </div>
+
+      <div class="form-actions">
+        <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
       </div>
     </div>
-
-    <div class="panel padding-10">
-      <div class="form-group">
-        <%= f.input :item_sets, :collection => @item_sets, :input_html => { :multiple => true },  :class => "form-control item_sets" %>
-      </div>
-    </div>
-
-    <div class="form-actions">
-      <%= f.button :submit %>
-    </div>
+    <% end %>
   </div>
-<% end %>
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        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
+      </div>
+    </div>  
+  </div>
+</div>
+

app/views/settings/set_menu_items/edit.html.erb

@@ -1,4 +1,4 @@
-<div class="span12">
+<!-- <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
@@ -8,8 +8,19 @@
 		</div>
 		
     <%= render 'form', settings_set_menu_item: @settings_menu_item, item_sets: @item_sets %>
+</div> -->
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
+    <li class="breadcrumb-item active">New</li>
+    <span class="float-right">
+      <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %>
+    </span>
+  </ol>
 </div>
-
+<br>
+<%= render 'form', settings_set_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>
 <script type="text/javascript">
 $(function(){
 	// auto selected after loaded

app/views/settings/set_menu_items/index.html.erb

@@ -1,4 +1,4 @@
-<div class="page-header">
+<!-- <div class="page-header">
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
   <li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
@@ -8,86 +8,126 @@
     <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
   </span>
  </ul>
+</div> -->
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item active">Menu Category</li>
+    <span class="float-right">
+      <%= link_to 'Back', dashboard_path %>
+    </span>
+  </ol>
 </div>
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Menu Category</h4>
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Menu</th>
-          <th>Name</th>
-          <th>Alt name</th>
-          <th>Order by</th>
-          <th>Parent</th>
-          <th colspan="3"></th>
-        </tr>
-      </thead>
+<br>
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+   <div class="card">
+    <ul class="list-group">
+      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+    </ul>
+  </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
 
-      <tbody>
+  <div class="card">
+    <div class="card-block">
+      <h4 class="card-title">Menu Category
+      <!-- <div class="m-b-10 clearfix"> -->
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+  <!-- </div> --></h4>
+
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Menu</th>
+            <th>Name</th>
+            <th>Alt name</th>
+            <th>Order by</th>
+            <th>Parent</th>
+            <th>Actions</th>
+          </tr>
+        </thead>
+
+        <tbody>
           <tr>
             <td><%= @category.menu.name %></td>
             <td><%= @category.name %></td>
             <td><%= @category.alt_name %></td>
             <td><%= @category.order_by %></td>
             <td><%= @category.parent.name rescue "-" %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_path(@category) %></td>
+            <td><%= link_to 'Edit', edit_settings_menu_category_path(@category),:class => 'btn btn-info btn-lg float-right waves-effect"' %></td>
           </tr>
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    </div>
   </div>
-</div>
-<br/>
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Menu Items
-      <span style="float: right">
-        <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
-        <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
+  <br/>
+  <div class="card">
+    <div class="card-block">
+      <h4 class="card-title">Menu Items
+        <span style="float: right">
+          <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
+          <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
 
-      </span>
-    </h4>
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Item code</th>
-          <th>Name</th>
-          <th>Alt name</th>
-          <th>Type</th>
-          <th>Parent Item</th>
-          <th>Created by</th>
-          <th>Created at</th>
+        </span>
+      </h4>
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Item code</th>
+            <th>Name</th>
+            <th>Alt name</th>
+            <th>Type</th>
+            <th>Parent Item</th>
+            <!-- <th>Created by</th> -->
+            <th>Created at</th>
 
-          <th colspan="3"></th>
-        </tr>
-      </thead>
+            <th>Actions</th>
+          </tr>
+        </thead>
 
-      <tbody>
-        <% @settings_menu_items.each do |settings_menu_item| %>
+        <tbody>
+          <% @settings_menu_items.each do |settings_menu_item| %>
           <tr>
             <td><%= settings_menu_item.item_code %></td>
             <td><%= settings_menu_item.name %></td>
             <td><%= settings_menu_item.alt_name %></td>
             <td><%= settings_menu_item.type %></td>
             <td><%= settings_menu_item.parent.name rescue "-" %></td>
-            <td><%= settings_menu_item.created_by %></td>
-            <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
+            <!-- <td><%= settings_menu_item.created_by %></td> -->
+            <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
             <% if settings_menu_item.type == "SimpleMenuItem" %>
-            <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-            <% else %>
-            <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td>
-            <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td>
-            <td><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+            <td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+              <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
+              <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } ,:class => 'btn btn-danger btn-sm waves-effect'%></td>
+              <% else %>
+              <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+                <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
+                <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
+                <% end %>
+              </tr>
+              <% end %>
+            </tbody>
+          </table>
 
+        </div>
+
+      </div>
+      <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> 
+    </div>
+    <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+      <div class="card">
+        <div class="body">
+          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
+        </div>
+      </div>  
+    </div>
   </div>
-
-</div>
- <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> 

app/views/settings/set_menu_items/new.html.erb

@@ -3,7 +3,7 @@
 <%= render 'form', settings_menu_item: @settings_menu_item %> -->
 
 
-<div class="span12">
+<!-- <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
@@ -12,4 +12,17 @@
 		 </ul>
 		</div>
     <%= render 'form', settings_set_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>
+</div> -->
+
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
+    <li class="breadcrumb-item active">New</li>
+    <span class="float-right">
+      <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %>
+    </span>
+  </ol>
 </div>
+<br>
+<%= render 'form', settings_set_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>

app/views/settings/set_menu_items/show.html.erb

@@ -1,15 +1,28 @@
-
 <div class="page-header">
- <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
-  <li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
-  <li>Menu Item</li>
-  <span style="float: right">
-  </span>
- </ul>
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
+    <li class="breadcrumb-item active">Details</li>
+    <span class="float-right">
+      <%= link_to 'Back', settings_menu_category_set_menu_items_path(@category) %>
+    </span>
+  </ol>
 </div>
 
-<div class="card">
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+   <div class="card">
+    <ul class="list-group">
+      <li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
+      <li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
+    </ul>
+  </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
+    <div class="card">
   <div class="card-block">
     <h4 class="card-title">Menu Item </h4>
     <table class="table">
@@ -38,14 +51,13 @@
           <td><%= @settings_menu_item.min_qty %></td>
           <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
 
-          <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %></td>
+          <td><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %></td>
         </tr>
       </tbody>
     </table>
   </div>
 </div>
 
-<br>
 <div class="card">
   <div class="card-block">
     <h4 class="card-title">Menu Item Instances
@@ -58,15 +70,15 @@
       <thead>
         <tr>
           <!-- <th>Menu Item Id</th> -->
-          <th>item_instance_code</th>
-          <th>item_instance_name</th>
-          <th>item_attributes</th>
+          <th>Instance code</th>
+          <th>Instance name</th>
+          <th>Attributes</th>
           <th>price</th>
-          <th>is_on_promotion</th>
-          <th>promotion_price</th>
-          <th>Created at</th>
+          <th>Promotion</th>
+          <th>promotion price</th>
+          <!-- <th>Created at</th> -->
 
-          <th colspan="3"></th>
+          <th>Actions</th>
         </tr>
       </thead>
 
@@ -80,15 +92,25 @@
             <td><%= settings_menu_item.price %></td>
             <td><%= settings_menu_item.is_on_promotion %></td>
             <td><%= settings_menu_item.promotion_price %></td>
-            <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td>
-            <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ) %></td>
-            <td><%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item) %></td>
-            <td><%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+           <!--  <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> -->
+            <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+            <%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
+            <%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td>
           </tr>
         <% end %>
       </tbody>
     </table>
   </div>
 </div>
-
+</div>
+ <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+          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
+      </div>
+    </div>  
+  </div>
 </div>