RubyGems - beautiful_scaffold - Versions diffs - 1.0.1 → 2.0.2 - Mend

beautiful_scaffold 1.0.1 → 2.0.2

Files changed (88) hide show

data/lib/generators/templates/app/views/layout.html.erb CHANGED Viewed

@@ -5,63 +5,63 @@
     <title>Beautiful Scaffold</title>
     <meta name="description" content="Beautiful Scaffold">
-    <meta name="author" content="You or me Sylvain Claudel (http://blog.escarworld.com)">
+    <meta name="author" content="You or me Sylvain Claudel (https://blog.rivsc.ovh)">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <%%= stylesheet_link_tag "application-bs" %>
-    <%%= javascript_include_tag "application-bs" %>
+    <!--TODO remove cdn-->
+    <script src="https://unpkg.com/driver.js/dist/driver.min.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/driver.js/dist/driver.min.css">
+    <%%= stylesheet_link_tag "<%= engine_name %>application-bs" %>
+    <%%= javascript_include_tag "<%= engine_name %>application-bs" %>
     <%%= csrf_meta_tags %>
     <%%= yield :head %>
   </head>
-  <body style="display:none;">
-    <div class="navbar navbar-default navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <i class="fa fa-bars"></i>
-          </button>
-          <a class="navbar-brand" href="#">
-            Beautiful-Scaffold
-          </a>
-        </div>
-        <div class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="/">Home</a></li>
-            <%%= render :partial => "layouts/beautiful_menu" %>
-          </ul>
-          <ul class="nav navbar-nav pull-right">
-            <li>
-              <!-- Beautiful_scaffold - Signin - Do not remove -->
-            </li>
-          </ul>
-        </div>
+  <body>
+    <div class="navbar navbar-expand-md navbar-dark bg-dark">
+      <div class="navbar-header">
+        <a class="navbar-brand" href="#">
+          Beautiful-Scaffold
+        </a>
+        <button type="button" class="navbar-toggler collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+      </div>
+      <div class="navbar-collapse collapse">
+        <nav class="nav navbar-nav">
+          <a href="/" class="nav-link">Home</a>
+          <%%= render :partial => "layouts/beautiful_menu" %>
+          <!-- Beautiful_scaffold - Signin - Do not remove -->
+        </nav>
+        <i class="fa fa-question-circle text-white float-right" id="bs-help"></i>
       </div>
     </div>
     <div class="container-fluid">
       <div class="row">
-        <div class="col-md-2">
-          <ul class="nav nav-pills nav-stacked">
-            <%%= render :partial => "layouts/beautiful_menu" %>
-          </ul>
-        </div>
-        <div class="col-md-10">
-          <%% if not flash[:notice].blank? then %>
+        <div class="col-md filler">
+          <%% if !flash[:notice].blank? %>
             <div class="alert alert-info">
               <a class="close" data-dismiss="alert" href="#">×</a>
               <h4 class="alert-heading">Info : </h4>
               <%%= flash[:notice] %>
             </div>
           <%% end %>
-          <%% if not flash[:error].blank? then %>
+          <%% if !flash[:alert].blank? %>
+            <div class="alert alert-warning">
+              <a class="close" data-dismiss="alert" href="#">×</a>
+              <h4 class="alert-heading">Warning : </h4>
+              <%%= flash[:alert] %>
+            </div>
+          <%% end %>
+          <%% if !flash[:error].blank? %>
             <div class="alert alert-danger">
               <a class="close" data-dismiss="alert" href="#">×</a>
               <h4 class="alert-heading">Error : </h4>
               <%%= flash[:error] %>
             </div>
           <%% end %>
-          <div>
+          <div class="mt-2">
             <%%= yield %>
           </div>
         </div>
@@ -76,7 +76,7 @@
     <!-- Beautiful_scaffold - Modal - Do not remove -->
     <script type="text/javascript">
-      <%% if not @opened_modal.blank? then %>
+      <%% if !@opened_modal.blank? %>
       $('<%%= @opened_modal %>').modal('show');
       <%% end %>
     </script>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.en.html.erb ADDED Viewed

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1> Welcome <%= @user.email %> </h1>
+<p>
+  You have successfully signed up to www.example.com, and your username is: <%= @user.email %>.
+</p>
+<p>
+  To login to the site, just follow this link: <%= @url %> .
+</p>
+<p>Thanks for joining and have a great day!</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.en.text.erb ADDED Viewed

@@ -0,0 +1,9 @@
+Welcome to example.com, <%= @user.email %>
+===============================================
+You have successfully signed up to example.com,
+your username is: <%= @user.email %>.
+To login to the site, just follow this link: <%= @url %> .
+Thanks for joining and have a great day!

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.fr.html.erb ADDED Viewed

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Bienvenue <%= @user.email %> </h1>
+<p>
+  Vous vous êtes inscrit à www.example.com, votre identifiant est : <%= @user.email %>.
+</p>
+<p>
+  Pour activer votre compte, veuillez cliquer sur ce lien : <%= @url %> .
+</p>
+<p>Merci d'avoir créé votre compte, bonne journée !</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.fr.text.erb ADDED Viewed

@@ -0,0 +1,8 @@
+Bienvenue, <%= @user.email %>
+===============================================
+Vous vous êtes inscrit à www.example.com, votre identifiant est : <%= @user.email %>.
+Pour activer votre compte, veuillez cliquer sur ce lien : <%= @url %> .
+Merci d'avoir créé votre compte, bonne journée !

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.en.html.erb ADDED Viewed

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Congratulations, <%= @user.email %>!</h1>
+<p>
+  You have successfully activated your example.com account,
+  your username is: <%= @user.email %>.
+</p>
+<p>
+  To login to the site, just follow this link: <%= @url %>.
+</p>
+<p>
+  Thanks for joining and have a great day!
+</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.en.text.erb ADDED Viewed

@@ -0,0 +1,8 @@
+Congratulations, <%= @user.email %>!
+You have successfully activated your example.com account,
+your username is: <%= @user.email %>.
+To login to the site, just follow this link: <%= @url %>.
+Thanks for joining and have a great day!

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.fr.html.erb ADDED Viewed

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Félicitations <%= @user.email %>!</h1>
+<p>
+  Vous avez activé votre compte sur www.example.com avec succès,
+  Votre identifiant est : <%= @user.email %>.
+</p>
+<p>
+  Pour ce connecter sur le site, veuillez suivre ce lien : <%= @url %>.
+</p>
+<p>
+  Merci de vous être inscrit, bonne journée !
+</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.fr.text.erb ADDED Viewed

@@ -0,0 +1,8 @@
+Félicitations <%= @user.email %>!
+Vous avez activé votre compte sur www.example.com avec succès,
+Votre identifiant est : <%= @user.email %>.
+Pour ce connecter sur le site, veuillez suivre ce lien : <%= @url %>.
+Merci de vous être inscrit, bonne journée !

data/lib/generators/templates/app/views/login_logout/user_sessions/_form.html.erb ADDED Viewed

@@ -0,0 +1,15 @@
+<%= form_with url: user_sessions_path, method: :post do |f| %>
+  <div class="form-group">
+    <%= f.label :email, :class => "control-label" %><br />
+    <%= f.text_field :email, :class => "form-control" %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password, :class => "control-label" %><br />
+    <%= f.password_field :password, :class => "form-control" %>
+  </div>
+  <div>
+    <%= link_to t(:back, :default => 'Back'), users_path, :class => "btn btn-light" %>
+    <%= f.submit :class => "btn btn-primary", :data => { :disable_with => t(:saving, :default => "Saving...") } %>
+  </div>
+<% end %>

data/lib/generators/templates/app/views/login_logout/user_sessions/new.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<h2><%= t(:login, :default => 'Login') %></h2>
+<%= render 'form' %>

data/lib/generators/templates/app/views/new.html.erb CHANGED Viewed

@@ -1,5 +1,3 @@
 <h2><%%= t(:new, :default => 'New') %> <%%= <%= i18n_t_m(singular_table_name) %> %></h2>
 <%%= render 'form' %>
-<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>

data/lib/generators/templates/app/views/partials/_forget_password.html.erb CHANGED Viewed

@@ -2,8 +2,8 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
+        <h5 class="modal-title"><%%= t(:forgot_password, :default => "Forgot password") %></h5>
         <button type="button" class="close" data-dismiss="modal">×</button>
-        <h3><%%= t(:forgot_password, :default => "Forgot password") %></h3>
       </div>
       <div class="modal-body">
         <%%= form_for('<%= model %>', :as => '<%= model %>', :url => password_path('<%= model %>'), :html => { :method => :post, :class => "form-horizontal" }) do |f| %>
@@ -15,7 +15,7 @@
           </div>
           <div class="form-group">
             <div>
-              <%%= f.submit t(:send_me_reset_password_instructions, :default => "Send me reset password instructions"), :class => 'btn btn-default' %>
+              <%%= f.submit t(:send_me_reset_password_instructions, :default => "Send me reset password instructions"), :class => 'btn btn-light' %>
             </div>
           </div>
         <%% end %>

data/lib/generators/templates/app/views/partials/_form_field.html.erb CHANGED Viewed

@@ -1,52 +1,60 @@
 <%- attributes.each do |attribute| -%>
-  <%- if @beautiful_attributes.include?(attribute.name + ':wysiwyg') then -%>
+  <%- if @beautiful_attributes.include?(attribute.name + ':wysiwyg') -%>
     <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
       <%%= f.text_area :<%= attribute.name %>, :class => "wysiwyg-editor form-control" %>
     </div>
     <%%= f.hidden_field :<%= attribute.name %>_typetext, :value => "html"  %>
-  <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
+  <%- elsif @beautiful_attributes.include?(attribute.name + ':references') -%>
     <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.camelcase %>.all, :id, :caption, { :include_blank => true }, { :class => "form-control" } %>
+      <%%= f.collection_select :<%= attribute.name %>_id, <%= engine_camel.present? ? "#{engine_camel}::" : '' %><%= attribute.name.camelcase %>.all, :id, :caption, { :include_blank => true }, { :class => "form-control" } %>
     </div>
-  <%- elsif @beautiful_attributes.include?(attribute.name + ':price') then -%>
+  <%- elsif @beautiful_attributes.include?(attribute.name + ':price') -%>
     <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
       <div class="input-group">
-        <span class="input-group-addon">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %>
+        <span class="input-group-text">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %>
       </div>
     </div>
-  <%- elsif @beautiful_attributes.include?(attribute.name + ':date') then -%>
+  <%- elsif (datetime_field = @beautiful_attributes.include?(attribute.name + ':datetime')) || @beautiful_attributes.include?(attribute.name + ':date') -%>
     <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
-      <div class="input-group">
-        <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end), :class => "dpicker form-control" %><span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-      </div>
+      <% if datetime_field %>
+      <div class="row">
+      <% end %>
+        <div id="container_<%= singular_table_name %>_<%= attribute.name %>_dp" data-field="<%= singular_table_name %>_<%= attribute.name %>_input_" class="input-group input-datetime dpicker <%= (datetime_field ? 'col-sm' : '') %>" data-target-input="nearest">
+          <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end),
+                           :class => "form-control datetimepicker-input",
+                           "data-target" => "#container_<%= singular_table_name %>_<%= attribute.name %>_dp",
+                           "data-id" => "<%= singular_table_name %>_<%= attribute.name %>_input_", id: nil %>
+          <div class="input-group-append" data-target="container_<%= singular_table_name %>_<%= attribute.name %>_dp" data-toggle="datetimepicker">
+            <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+          </div>
+        </div>
+        <% if datetime_field %>
+          <div id="container_<%= singular_table_name %>_<%= attribute.name %>_tp" data-field="<%= singular_table_name %>_<%= attribute.name %>_input_" class="input-group input-datetime tpicker col-sm" data-target-input="nearest">
+            <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%H:%M") rescue "" end),
+                             :class => "form-control datetimepicker-input",
+                             "data-target" => "#container_<%= singular_table_name %>_<%= attribute.name %>_tp",
+                             "data-id" => "<%= singular_table_name %>_<%= attribute.name %>_input_", id: nil %>
+            <div class="input-group-append" data-target="container_<%= singular_table_name %>_<%= attribute.name %>_tp" data-toggle="datetimepicker">
+              <span class="input-group-text"><i class="fa fa-clock"></i></span>
+            </div>
+          </div>
+        <% end %>
+        <%% ["year","mon","day" <%= datetime_field ? ',"min","hour"' : '' %>].each_with_index do |meth, i| %>
+          <%%= f.hidden_field("<%= attribute.name %>(#{i+1}i)", value: @<%= singular_table_name %>.<%= attribute.name %>&.send(meth), id: "<%= singular_table_name %>_<%= attribute.name %>_input_#{i+1}i") %>
+        <%% end %>
+      <% if datetime_field %>
+        </div>
+      <% end %>
     </div>
-  <%- elsif @beautiful_attributes.include?(attribute.name + ':datetime') then -%>
+  <%- elsif @beautiful_attributes.include?(attribute.name + ':color') -%>
     <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
-      <div class="input-group">
-        <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end), :class => "dpicker form-control" %><span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-      </div>
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(4i)]" id="<%= singular_table_name %>_<%= attribute.name %>_4i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.min rescue "" end %>" />
-      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(5i)]" id="<%= singular_table_name %>_<%= attribute.name %>_5i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.hour rescue "" end %>" />
       <div class="input-group">
-        <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%H:%M") rescue "" end), :class => "tpicker form-control" %><span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
-      </div>
-    </div>
-  <%- elsif @beautiful_attributes.include?(attribute.name + ':color') then -%>
-    <div class="form-group">
-      <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="input-group color" data-color="<%%= (@<%= model %>.<%= attribute.name %> || "rgba(0, 0, 0)") %>" data-color-format="rgba">
-        <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %><span class="input-group-addon"><i style="background-color: rgb(0, 0, 0)"></i></span>
+        <%%= f.color_field :<%= attribute.name %>, :class => "form-control" %>
       </div>
     </div>
   <%- else -%>

data/lib/generators/templates/app/views/partials/_index_batch.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <%- attributes.each{ |attribute| -%>
-  <%- if attribute.type.to_s == "boolean" then -%>
+  <%- if attribute.type.to_s == "boolean" -%>
           <option value="<%= attribute.name %>.true"><%%= t(:settrueforattr, :attr => "'<%= attribute.name %>'", :default => "Set <%= attribute.name %> to true") %></option>
           <option value="<%= attribute.name %>.false"><%%= t(:setfalseforattr, :attr => "'<%= attribute.name %>'", :default => "Set <%= attribute.name %> to false") %></option>
   <%- end -%>

data/lib/generators/templates/app/views/partials/_index_column.html.erb CHANGED Viewed

@@ -1,15 +1,17 @@
 <%- attributes.each do |attribute| -%>
             <td <%%= visible_column("<%= singular_table_name %>", "<%= attribute.name %>") %> class="bs-col-<%= attribute.name %> <%%= align_attribute("<%= attribute.type %>") %>">
-              <%- if @beautiful_attributes.include?(attribute.name + ':price') then -%>
+              <%- if @beautiful_attributes.include?(attribute.name + ':price') -%>
                 <%%= number_to_currency(<%= singular_table_name %>.<%= attribute.name %>, :locale => I18n.locale) %>
-              <%- elsif @beautiful_attributes.include?(attribute.name + ':boolean') then -%>
+              <%- elsif @beautiful_attributes.include?(attribute.name + ':boolean') -%>
                 <%%= t((<%= singular_table_name %>.<%= attribute.name %> ? "yes" : "no").to_sym) %>
-              <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
-                <%% if not <%= singular_table_name %>.<%= attribute.name %>_id.nil? then %>
+              <%- elsif @beautiful_attributes.include?(attribute.name + ':references') -%>
+                <%% if !<%= singular_table_name %>.<%= attribute.name %>_id.nil? %>
                   <%%= link_to <%= singular_table_name %>.<%= attribute.name %>.caption, <%= namespace_for_route %><%= attribute.name %>_path(<%= singular_table_name %>.<%= attribute.name %>_id) %>
                 <%% else %>
                   <%%= t(:any, :default => "Any") %>
                 <%% end %>
+              <%- elsif @beautiful_attributes.include?(attribute.name + ':color') -%>
+                <span class="overview-color" style="background-color:<%%= <%= singular_table_name %>.<%= attribute.name %> %>;">&nbsp;</span>
               <%- else -%>
                 <%%= <%= singular_table_name %>.<%= attribute.name %> %>
               <%- end -%>

data/lib/generators/templates/app/views/partials/_index_header.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <%- attributes.each do |attribute| -%>
             <th <%%= visible_column("<%= singular_table_name %>", "<%= attribute.name %>") %> class="bs-col-<%= attribute.name %>">
               <%- id_or_not = "" -%>
-              <%- if @beautiful_attributes.include?(attribute.name + ':references') then -%>
+              <%- if @beautiful_attributes.include?(attribute.name + ':references') -%>
                 <%- id_or_not = "_id" -%>
               <%- end -%>
               <%%= sorting_header("<%= singular_table_name %>", "<%= attribute.name %><%= id_or_not %>", "<%= namespace_alone %>") %>

data/lib/generators/templates/app/views/partials/_index_search.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <%- next if @beautiful_attributes.include?(a.name + ':color') -%>
   <%- attribute = "" -%>
   <%- caption = a.name.capitalize -%>
-  <%- if @beautiful_attributes.include?(a.name + ':references') then -%>
+  <%- if @beautiful_attributes.include?(a.name + ':references') -%>
     <%- attribute = "_id" -%>
   <%- end -%>
       <%%= ransack_field("<%= singular_table_name %>", "<%= a.name %><%= attribute %>", f, "<%= caption %>"<%= (engine_name.blank? ? '' : ", \"#{engine_opt}\"") %>) %>

data/lib/generators/templates/app/views/partials/_login_logout_register.html.erb ADDED Viewed

@@ -0,0 +1,7 @@
+<% if current_user %>
+  <%= link_to "Edit Profile", edit_user_path(current_user.id), class: "nav-link" %>
+  <%= link_to "Logout", :logout, method: :post, class: "nav-link" %>
+<% else %>
+  <%= link_to "Register", new_user_path, class: "nav-link" %>
+  <%= link_to "Login", :login, class: "nav-link" %>
+<% end %>

data/lib/generators/templates/app/views/partials/_show_field.html.erb CHANGED Viewed

@@ -1,12 +1,14 @@
 <%- attributes.each do |attribute| -%>
   <p>
     <b><%%= <%= i18n_t_a(singular_table_name, attribute.name) %> %>:</b>
-    <%- if @beautiful_attributes.include?(attribute.name + ':price') then -%>
+    <%- if @beautiful_attributes.include?(attribute.name + ':price') -%>
       <%%= number_to_currency(@<%= singular_table_name %>.<%= attribute.name %>) %>
-    <%- elsif @beautiful_attributes.include?(attribute.name + ':boolean') then -%>
+    <%- elsif @beautiful_attributes.include?(attribute.name + ':boolean') -%>
       <%%= t((@<%= singular_table_name %>.<%= attribute.name %> ? "yes".to_sym : "no".to_sym)) %>
-    <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
+    <%- elsif @beautiful_attributes.include?(attribute.name + ':references') -%>
       <%%= (@<%= singular_table_name %>.<%= attribute.name %>.nil? ? "" : @<%= singular_table_name %>.<%= attribute.name %>.caption) %>
+    <%- elsif @beautiful_attributes.include?(attribute.name + ':color') -%>
+      <span class="overview-color" style="background-color:<%%= @<%= singular_table_name %>.<%= attribute.name %> %>;">&nbsp;</span>
     <%- else -%>
       <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
     <%- end -%>