From 342ae3ed357d33aa8d1c855bde5bde838ea92cf2 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Thu, 20 Apr 2017 17:46:27 +0630
Subject: [PATCH] added bootrap

---
 Gemfile                                       |  5 +-
 Gemfile.lock                                  |  4 +-
 .../settings/menu_categories/_form.html.erb   |  1 +
 .../settings/menu_categories/index.html.erb   | 68 ++++++++++---------
 .../settings/menu_categories/new.html.erb     | 14 ++--
 .../settings/menu_categories/show.html.erb    |  2 +-
 6 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/Gemfile b/Gemfile
index 63e24e92..2e3813be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,11 +5,12 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-#gem 'sqlite3' - 
+#gem 'sqlite3' -
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.0.2'
 # Use mysql as the database for Active Record
-gem 'mysql2', '>= 0.3.18', '< 0.5'
+#gem 'mysql2', '>= 0.3.18', '< 0.5'
+gem 'pg'
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
diff --git a/Gemfile.lock b/Gemfile.lock
index c89fcd45..4d0efb49 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,11 +96,11 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.12.1)
-    mysql2 (0.4.5)
     nio4r (2.0.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pdf-core (0.7.0)
+    pg (0.20.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -230,7 +230,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
-  mysql2 (>= 0.3.18, < 0.5)
+  pg
   prawn
   prawn-table
   puma (~> 3.0)
diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb
index 8ed4e3ba..6a48555d 100644
--- a/app/views/settings/menu_categories/_form.html.erb
+++ b/app/views/settings/menu_categories/_form.html.erb
@@ -8,6 +8,7 @@
     <%= f.input :alt_name %>
     <%= f.input :order_by %>
     <%= f.association :parent %>
+
   </div>
 
   <div class="form-actions">
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index 6024ff79..bd648938 100644
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -1,35 +1,41 @@
-<p id="notice"><%= notice %></p>
 
-<h1>Settings Menu Categories</h1>
-
-<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>
-
-  <tbody>
-    <% @settings_menu_categories.each do |settings_menu_category| %>
-      <tr>
-        <td><%= settings_menu_category.menu %></td>
-        <td><%= settings_menu_category.name %></td>
-        <td><%= settings_menu_category.alt_name %></td>
-        <td><%= settings_menu_category.order_by %></td>
-        <td><%= settings_menu_category.parent.name %></td>
-        <td><%= link_to 'Show', settings_menu_category %></td>
-        <td><%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %></td>
-        <td><%= link_to 'Destroy', settings_menu_category, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Menu Categories</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
 
 <br>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>Menu</th>
+        <th>Name</th>
+        <th>Alt name</th>
+        <th>Order by</th>
+        <th>Parent</th>
+        <th></th>
+        <th></th>
+      </tr>
+    </thead>
 
-<%= link_to 'New Settings Menu Category', new_settings_menu_category_path %>
+    <tbody>
+      <% @settings_menu_categories.each do |settings_menu_category| %>
+        <tr>
+          <td><%= settings_menu_category.menu rescue '' %></td>
+          <td><%= settings_menu_category.name rescue ''%></td>
+          <td><%= settings_menu_category.alt_name rescue ''%></td>
+          <td><%= settings_menu_category.order_by rescue ''%></td>
+          <td><%= settings_menu_category.parent.name rescue ''%></td>
+          <td><%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %> | <%= link_to 'Destroy', method: :delete, data: { confirm: 'Are you sure?' } %></td></td>
+
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
diff --git a/app/views/settings/menu_categories/new.html.erb b/app/views/settings/menu_categories/new.html.erb
index 2989b8d1..ee9d8ab8 100644
--- a/app/views/settings/menu_categories/new.html.erb
+++ b/app/views/settings/menu_categories/new.html.erb
@@ -1,5 +1,11 @@
-<h1>New Settings Menu Category</h1>
 
-<%= render 'form', settings_menu_category: @settings_menu_category %>
-
-<%= link_to 'Back', settings_menu_categories_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_menu_categories_path %>">Menu Categories</a></li>
+		  	<li>New</li>
+		 </ul>
+		</div>
+        <%= render 'form', settings_menu_category: @settings_menu_category %>
+</div>
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index af08ff02..38474543 100644
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -22,7 +22,7 @@
 
 <p>
   <strong>Menu category:</strong>
-  <%= @settings_menu_category.menu_category %>
+  <%= @settings_menu_category.menu_category rescue '' %>
 </p>
 
 <%= link_to 'Edit', edit_settings_menu_category_path(@settings_menu_category) %> |