admin-panel 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bbe264a8f0f9ce2982096d8dc4b8873c1cdf736
-  data.tar.gz: 3bb81974a0670450b6530da533311a6325dd5edb
+  metadata.gz: d576adba9f3f426390beb98ce565a2dd3f9cad6c
+  data.tar.gz: b0b7c5cbabace377af3932220d4b8b259b5bc64d
 SHA512:
-  metadata.gz: bf8e131f97cc7c676133a242eff4c57a49627f8ad229f2d783fbe86ce5429d4b48bb8444d818127c56307ef6b6e827216b5a788dfdc5eaa5d56bd9562a2e8b7b
-  data.tar.gz: 4ad86baa443f5c7c2e6cbf594f3dc11270cc833b316fae60c34b1aabc43fb6b5d3432fa285ba95bb439138d99ea37464c6de032e4c0e695f628dde3929bba142
+  metadata.gz: 7767e7da9205c126aa2b6a90595f7d65fb0c2445009e948dd6ced8c64d4390695a51932487be12d255d13e1e313126e7c9e5162d844fd8cdfaaa4e207f4487c3
+  data.tar.gz: c67f7de6a57171029cf9b55db6140691629254c6ac261a001cc55ffc9ec77556d70ec8ad89398b9d51f9f6920ddf8fdb6144e0e1d9c1c1b397723d49f73e235c

data/.gitignore

@@ -1,2 +1,4 @@
 .idea
 tmp/
+.DS_Store
+*/.DS_Store

data/Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     admin-panel (0.1.2)
       bootstrap-sass (~> 3.1)
       devise (~> 3.2)
+      kaminari (~> 0.16)
       railties (>= 4.0.0)
       sass-rails (>= 4.0.0)
       simple_form (>= 3.1.0.rc1)
@@ -48,6 +49,9 @@ GEM
     hike (1.2.3)
     i18n (0.6.9)
     json (1.8.1)
+    kaminari (0.16.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     minitest (5.3.4)
     multi_json (1.10.1)
     orm_adapter (0.5.0)

data/README.md

@@ -9,10 +9,11 @@ Installation
 Start with adding these gems to your Gemfile:
 
 ```ruby
-gem 'admin-panel', '~> 0.1.1'
+gem 'admin-panel', '~> 0.1.3'
 gem 'devise', '~> 3.2'
 gem 'simple_form', '3.1.0.rc1'
 gem 'bootstrap-sass', '~> 3.1'
+gem 'kaminari', '~> 0.16.1'
 ```
 
 Then do `bundle install` and run the installer:
@@ -40,6 +41,8 @@ Thanks
 
 This gem was based mostly on two different pieces of software: [bootstrap-generators](https://github.com/decioferreira/bootstrap-generators) and [rails-admin-scaffold](https://github.com/dhampik/rails-admin-scaffold)
 
+I also took the liberty of copying kaminari bootstrap templates from [kaminari-bootstrap](https://github.com/mcasimir/kaminari-bootstrap)
+
 TODO
 ----
 
@@ -48,8 +51,9 @@ Currently this gem is pretty much one-evening project, I'm not sure if I'll cont
 Things that'd be nice to have:
 
 - support for anything more than Active Record
-- support for anything more than Erb (haml, slim)
+- ~~support for anything more than Erb (haml)~~
+- support for slim
 - namespace change support and more configuration options
-- kaminari/will_paginate support 
+- ~~kaminari/will_paginate support~~ 
 - I liked the idea of copying the files to your project during install at first but now it just seems silly; I should probably rewrite everything from scratch to work more similarly to Devise, including the ability to extend default controllers where necessary
 - I was also supposed to add Carrierwave support too but ran out of time

data/admin-panel.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors     = ['Michał Matyas']
   spec.email       = ['michal@higher.lv']
   spec.summary     = 'Generates Twitter Bootstrap based admin panel with scaffolder'
-  spec.description = 'Generates Twitter Bootstrap based admin panel with scaffolder. Project is quite opinionated, requires Rails 4, SASS, SimpleForm and Devise.'
+  spec.description = 'Generates Twitter Bootstrap based admin panel with scaffolder. Project is quite opinionated, requires Rails 4, SASS, SimpleForm, Kaminari and Devise.'
   spec.homepage    = 'https://github.com/d4rky-pl/admin-panel'
   spec.license     = 'MIT'
 
@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'bootstrap-sass', '~> 3.1'
   spec.add_runtime_dependency 'simple_form', '>= 3.1.0.rc1'
   spec.add_runtime_dependency 'devise', '~> 3.2'
+  spec.add_runtime_dependency 'kaminari', '~> 0.16'
 end

data/lib/admin-panel/version.rb

@@ -1,3 +1,3 @@
 module AdminPanel
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/generators/admin_panel/install/install_generator.rb

@@ -16,16 +16,20 @@ module AdminPanel
         invoke 'simple_form:install', [], ['--bootstrap']
       end
 
+      def generate_kaminari_config
+        invoke 'kaminari:config'
+      end
+
       attr_reader :app_name
 
       def copy_layout
         @app_name = ::Rails.application.class.to_s.split("::").first.humanize
         extension = "html.#{options[:template_engine]}"
 
-        template "layouts/admin/application.#{extension}", "app/views/layouts/admin/application.#{extension}"
+        template "layouts/#{options[:template_engine]}/admin/application.html.#{options[:template_engine]}", "app/views/layouts/admin/application.html.#{options[:template_engine]}"
         ['_messages', '_navigation'].each do |file|
           filename = "#{file}.#{extension}"
-          copy_file "layouts/admin/#{filename}", "app/views/layouts/admin/#{filename}"
+          copy_file "layouts/#{options[:template_engine]}/admin/#{filename}", "app/views/layouts/admin/#{filename}"
         end
       end
 
@@ -39,7 +43,7 @@ module AdminPanel
 
       def copy_scaffold
         directory 'controllers', 'app/controllers'
-        directory 'views', 'app/views'
+        directory "views/#{options[:template_engine]}", 'app/views'
       end
 
       def create_admin_model

data/lib/generators/admin_panel/install/templates/layouts/haml/admin/_messages.html.haml

@@ -0,0 +1,5 @@
+- flash.each do |name, msg|
+  - if msg.is_a?(String)
+    %div{class: "alert alert-#{name.to_s == 'notice' ? 'success' : 'danger'}"}
+      %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", type: "button"} ×
+      = content_tag :div, msg, :id => "flash_#{name}"

data/lib/generators/admin_panel/install/templates/layouts/haml/admin/_navigation.html.haml

@@ -0,0 +1,13 @@
+%nav.navbar.navbar-default{role: "navigation"}
+  .container-fluid
+    .navbar-header
+      %a.navbar-brand{href: admin_dashboard_path} App name
+
+    - if admin_signed_in?
+      %ul.nav.navbar-nav
+        - admin_pages.each do |page|
+          %li{class: controller_name == page[:controller] ? 'active' : ''}
+            %a{href: page[:url]}= page[:name]
+
+      %ul.nav.navbar-nav.navbar-right
+        %li= link_to 'Sign out', destroy_admin_session_path, method: :delete

data/lib/generators/admin_panel/install/templates/layouts/haml/admin/application.html.haml

@@ -0,0 +1,16 @@
+!!!
+%html
+  %head
+    %meta{ content: "width=device-width, initial-scale=1.0", name: "viewport" }/
+    %title= content_for?(:title) ? yield(:title) : "<%= app_name.underscore.titleize %>"
+    %meta{ name: 'description', content: content_for?(:description) ? yield(:description) : "<%= app_name.underscore.titleize %>" }
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = csrf_meta_tags
+  %body
+    %header
+      = render partial: 'layouts/admin/navigation'
+    %main{ role: 'main' }
+      .container
+        = render partial: 'layouts/admin/messages'
+        = yield

data/lib/generators/admin_panel/install/templates/views/erb/admin/dashboard/index.html.erb

@@ -0,0 +1 @@
+  <h1>Dashboard goes here</h1>

data/lib/generators/admin_panel/install/templates/views/{admin → erb/admin}/sessions/new.html.erb

@@ -13,5 +13,5 @@
 <% end %>
 
 <%- if devise_mapping.recoverable? %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %>
 <% end -%>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_first_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? -%>
+  <li class="first">
+    <%= link_to raw(t 'views.pagination.first'), url, {:remote => remote} %>
+  </li>
+<% end -%>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><a><%= raw(t 'views.pagination.truncate') %></a></li>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_last_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? -%>
+  <li class="last">
+    <%= link_to raw(t 'views.pagination.last'), url, {:remote => remote} %>
+  </li>
+<% end -%>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_next_page.html.erb

@@ -0,0 +1,14 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+
+<% unless current_page.last? -%>
+  <li class="next">
+    <%= link_to raw(t 'views.pagination.next'), url, :remote => remote, :rel => 'next' %>
+  </li>
+<% end -%>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, (page.current? ? 'javascript:void(0)' : url), opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_paginator.html.erb

@@ -0,0 +1,23 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <ul class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+  </ul>
+<% end -%>

data/lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_prev_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    total_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? -%>
+  <li class="prev">
+    <%= link_to raw(t 'views.pagination.previous'), url, :remote => remote, :rel => 'prev' %>
+  </li>
+<% end -%>

data/lib/generators/admin_panel/install/templates/views/haml/admin/dashboard/index.html.haml

@@ -0,0 +1 @@
+%h1 Dashboard goes here

data/lib/generators/admin_panel/install/templates/views/haml/admin/passwords/edit.html.haml

@@ -0,0 +1,13 @@
+%h2 Change your password
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+  = f.error_notification
+
+  = f.input :reset_password_token, as: :hidden
+  = f.full_error :reset_password_token
+
+  .form-inputs
+    = f.input :password, label: "New password", required: true, autofocus: true
+    = f.input :password_confirmation, label: "Confirm your new password", required: true
+
+  .form-actions
+    = f.button :submit, "Change my password"

data/lib/generators/admin_panel/install/templates/views/haml/admin/passwords/new.html.haml

@@ -0,0 +1,10 @@
+%h2 Forgot your password?
+
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+
+  .form-actions
+    = f.button :submit, "Send me reset password instructions"

data/lib/generators/admin_panel/install/templates/views/haml/admin/sessions/new.html.haml

@@ -0,0 +1,13 @@
+%h2 Sign in
+
+= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+  .form-inputs
+    = f.input :email, required: false, autofocus: true
+    = f.input :password, required: false
+    = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+
+  .form-actions
+    = f.button :submit, "Sign in"
+
+- if devise_mapping.recoverable?
+  = link_to "Forgot your password?", new_password_path(resource_name)

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_first_page.html.haml

@@ -0,0 +1,11 @@
+-# Link to the "First" page
+-#  - available local variables
+-#    url:           url to the first page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+-#
+- unless current_page.first?
+  %li.first
+    = link_to raw(t 'views.pagination.first'), url, {:remote => remote}

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_gap.html.haml

@@ -0,0 +1,9 @@
+-# Non-link tag that stands for skipped pages...
+-#  - available local variables
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+-#
+%li.page.gap.disabled
+  %a= raw(t 'views.pagination.truncate')

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_last_page.html.haml

@@ -0,0 +1,11 @@
+-# Link to the "Last" page
+-#  - available local variables
+-#    url:           url to the last page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+
+- unless current_page.last?
+  %li.last
+    = link_to raw(t 'views.pagination.last'), url, {:remote => remote}

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_next_page.html.haml

@@ -0,0 +1,12 @@
+-# Link to the "Next" page
+-#  - available local variables
+-#    url:           url to the next page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+-#
+
+- unless current_page.last?
+  %li.next
+    = link_to raw(t 'views.pagination.next'), url, :remote => remote, :rel => 'next'

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_page.html.haml

@@ -0,0 +1,12 @@
+-# Link showing page number
+-#  - available local variables
+-#    page:          a page object for "this" page
+-#    url:           url to this page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+-#
+
+%li.page{ class: "#{'active' if page.current?}"}
+  = link_to page, (page.current? ? 'javascript:void(0)' : url), opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_paginator.html.haml

@@ -0,0 +1,21 @@
+-# The container tag
+-#  - available local variables
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+-#    paginator:     the paginator that renders the pagination tags inside
+-#
+
+= paginator.render do
+  %ul.pagination
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

data/lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_prev_page.html.haml

@@ -0,0 +1,11 @@
+-# Link to the "Previous" page
+-#  - available local variables
+-#    url:           url to the previous page
+-#    current_page:  a page object for the currently displayed page
+-#    total_pages:     total number of pages
+-#    per_page:      number of items to fetch per page
+-#    remote:        data-remote
+
+- unless current_page.first?
+  %li.prev
+    = link_to raw(t 'views.pagination.previous'), url, :remote => remote, :rel => 'prev'

data/lib/generators/admin_panel/scaffold/templates/controllers/controller.rb.erb

@@ -9,7 +9,7 @@ class <%= prefixed_controller_class_name %>Controller < <%= parent_controller_cl
 
   # GET <%= prefixed_route_url %>
   def index
-    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+    @<%= plural_table_name %> = <%= class_name %>.page params[:page]
   end
 
   # GET <%= prefixed_route_url %>/1

data/lib/generators/admin_panel/scaffold/templates/views/erb/_form.html.erb.erb

@@ -15,6 +15,6 @@
   </div>
 
   <div class="form-actions">
-    <%%= f.button :submit %>
+    <%%= f.button :submit, :class => 'btn btn-primary' %>
   </div>
 <%% end %>

data/lib/generators/admin_panel/scaffold/templates/views/erb/edit.html.erb.erb

@@ -1,12 +1,13 @@
 <div class="page-header">
-  <div class="row">
-    <div class="col-md-8">
-      <h2>Editing <%= singular_table_name %></h2>
-    </div>
-    <div class="col-md-4 text-right">
-      <%%= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default' %>
-    </div>
-  </div>
+  <%%= link_to <%= prefixed_index_helper %>_path, class: 'btn btn-default pull-right' do %>
+    <i class="glyphicon glyphicon-list-alt"></i>
+    Back
+  <%% end %>
+  <%%= link_to <%= "[:#{prefix}, @#{singular_table_name}]" %>, class: 'btn btn-primary pull-right' do %>
+    <i class="glyphicon glyphicon-info-sign"></i>
+    Show
+  <%% end %>
+  <h1>Editing <%= human_name %></h1>
 </div>
 
 <%%= render 'form' %>

data/lib/generators/admin_panel/scaffold/templates/views/erb/index.html.erb.erb

@@ -1,21 +1,19 @@
 <div class="page-header">
-  <div class="row">
-    <div class="col-md-8">
-      <h2>Listing <%= plural_table_name %></h2>
-    </div>
-    <div class="col-md-4 text-right">
-      <%%= link_to 'New <%= human_name %>', new_<%= prefixed_plain_model_url %>_path, class: 'btn btn-success'%>
-    </div>
-  </div>
+  <%%= link_to new_<%= prefixed_plain_model_url %>_path, class: 'btn btn-success pull-right' do %>
+    <i class="glyphicon glyphicon-plus"></i>
+    New <%= human_name %>
+  <%% end %>
+  <h1><%= plural_table_name.humanize %></h1>
 </div>
 
-<table class="table table-striped">
+<table class="table table-striped table-hover table-bordered">
   <thead>
     <tr>
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
       <th><%= attribute.human_name %></th>
 <% end -%>
-      <th class="text-right">Actions</th>
+      <th></th>
+      <th></th>
     </tr>
   </thead>
 
@@ -26,12 +24,16 @@
         <td><%%= link_to <%= singular_table_name %>.<%= attribute.name %>, <%= "[:#{prefix}, #{singular_table_name}]" %> %></td>
         <% end -%>
         <td class="text-right">
-          <%%= link_to 'Show', <%= "[:#{prefix}, #{singular_table_name}]" %>, class: 'btn btn-default' %>
           <%%= link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(<%= singular_table_name %>), class: 'btn btn-primary' %>
+        </td>
+        <td class="text-right">
           <%%= link_to 'Destroy', <%= "[:#{prefix}, #{singular_table_name}]" %>, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
-          </td>
+        </td>
       </tr>
     <%% end %>
   </tbody>
 </table>
 
+<div class="text-center">
+  <%%= paginate @<%= plural_table_name %>, theme: 'admin-bootstrap' %>
+</div>

data/lib/generators/admin_panel/scaffold/templates/views/erb/new.html.erb.erb

@@ -1,14 +1,10 @@
 <div class="page-header">
-  <div class="row">
-    <div class="col-md-8">
-      <h2>New <%= singular_table_name %></h2>
-    </div>
-    <div class="col-md-4 text-right">
-      <%%= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default' %>
-    </div>
-  </div>
+  <%%= link_to <%= prefixed_index_helper %>_path, class: 'btn btn-default pull-right' do %>
+    <i class="glyphicon glyphicon-list-alt"></i>
+    Back
+  <%% end %>
+  <h1>New <%= human_name %></h1>
 </div>
 
-
 <%%= render 'form' %>
 

data/lib/generators/admin_panel/scaffold/templates/views/erb/show.html.erb.erb

@@ -1,22 +1,18 @@
-<p id="notice"><%%= notice %></p>
+<div class="page-header">
+  <%%= link_to <%= prefixed_index_helper %>_path, class: 'btn btn-default pull-right' do %>
+    <i class="glyphicon glyphicon-list-alt"></i>
+    Back
+  <%% end %>
+  <%%= link_to edit_<%= prefixed_plain_model_url %>_path(@<%= singular_table_name %>), class: 'btn btn-primary pull-right' do %>
+    <i class="glyphicon glyphicon-pencil"></i>
+    Edit
+  <%% end %>
+  <h1>Show <%= human_name %></h1>
+</div>
 
-<table class="table table-striped">
-<tbody>
+<dl class="dl-horizontal">
   <% attributes.reject(&:password_digest?).each do |attribute| -%>
-    <tr>
-      <td><strong><%= attribute.human_name %>:</strong></td>
-      <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
-    </tr>
+    <dt><%= attribute.human_name %>:</dt>
+    <dd><%%= @<%= singular_table_name %>.<%= attribute.name %> %></dd>
   <% end -%>
-</tbody>
-</table>
-
-<div class="row">
-  <div class="col-md-6">
-    <%%= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default' %>
-  </div
-  <div class="col-md-6 text-right">
-    <%%= link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(@<%= singular_table_name %>), class: 'btn btn-primary' %>
-    <%%= link_to 'Destroy', <%= "[:#{prefix}, @#{singular_table_name}]" %>, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
-  </div>
-</div>
+</dl>

data/lib/generators/admin_panel/scaffold/templates/views/haml/_form.html.haml.erb

@@ -0,0 +1,15 @@
+= simple_form_for(<%= "[:#{prefix}, @#{singular_table_name}]" %>, html: { class: 'form-horizontal' },
+  wrapper: :horizontal_form,
+  wrapper_mappings: { check_boxes: :horizontal_radio_and_checkboxes,
+    radio_buttons: :horizontal_radio_and_checkboxes,
+    file: :horizontal_file_input,
+    boolean: :horizontal_boolean }) do |f|
+
+  = f.error_notification
+
+  .form-inputs
+<%- attributes.each do |attribute| -%>
+    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
+<%- end -%>
+  .form-actions
+    = f.button :submit, :class => 'btn btn-primary'

data/lib/generators/admin_panel/scaffold/templates/views/haml/edit.html.haml.erb

@@ -0,0 +1,12 @@
+.page-header
+  = link_to <%= prefixed_index_helper %>_path, class: 'btn btn-default pull-right' do
+    %i.glyphicon.glyphicon-list-alt
+    Back
+
+  = link_to <%= "[:#{prefix}, @#{singular_table_name}]" %>, class: 'btn btn-primary pull-right' do
+    %i.glyphicon.glyphicon-info-sign
+    Show
+  %h1
+    Editing <%= human_name %>
+
+= render 'form'

data/lib/generators/admin_panel/scaffold/templates/views/haml/index.html.haml.erb

@@ -0,0 +1,33 @@
+.page-header
+  = link_to new_<%= prefixed_plain_model_url %>_path, class: 'btn btn-success pull-right' do
+    %i.glyphicon.glyphicon-plus
+    New <%= human_name %>
+
+  %h1
+    <%= plural_table_name.humanize %></h1>
+
+%table.table.table-striped.table-hover.table-bordered
+  %thead
+    %tr
+<%- attributes.reject(&:password_digest?).each do |attribute| -%>
+      %th
+        <%= attribute.human_name %>
+<%- end -%>
+      %th
+      %th
+
+  %tbody
+    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+      %tr
+<%- attributes.reject(&:password_digest?).each do |attribute| -%>
+        %td
+          = link_to <%= singular_table_name %>.<%= attribute.name %>, <%= "[:#{prefix}, #{singular_table_name}]" %>
+<%- end -%>
+        %td.text-right
+          = link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(<%= singular_table_name %>), class: 'btn btn-primary'
+
+        %td.text-right
+          = link_to 'Destroy', <%= "[:#{prefix}, #{singular_table_name}]" %>, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger'
+
+.text-center
+  = paginate @<%= plural_table_name %>, theme: 'admin-bootstrap'

data/lib/generators/admin_panel/scaffold/templates/views/haml/new.html.haml.erb

@@ -0,0 +1,10 @@
+.page-header
+  = link_to <%= prefixed_index_helper %>_path, class: 'btn btn-default pull-right' do
+    %i.glyphicon.glyphicon-list-alt
+    Back
+
+  %h1
+    New <%= human_name %>
+
+= render 'form'
+

data/lib/generators/admin_panel/scaffold/templates/views/haml/show.html.haml.erb

@@ -0,0 +1,19 @@
+.page-header
+  = link_to <%= prefixed_index_helper %>_path, class: 'btn btn-default pull-right' do
+    %i.glyphicon.glyphicon-list-alt
+    Back
+
+  = link_to edit_<%= prefixed_plain_model_url %>_path(@<%= singular_table_name %>), class: 'btn btn-primary pull-right' do
+    %i.glyphicon.glyphicon-pencil
+    Edit
+
+  %h1
+    Show <%= human_name %>
+
+%dl.dl-horizontal
+<%- attributes.reject(&:password_digest?).each do |attribute| -%>
+  %dt
+    <%= attribute.human_name %>:
+  %dd
+    = @<%= singular_table_name %>.<%= attribute.name %>
+<%- end -%>

data/spec/generators/admin_panel/install/install_generator_spec.rb

@@ -19,6 +19,10 @@ describe AdminPanel::Generators::InstallGenerator do
       it_should_exist 'config/initializers/simple_form.rb'
     end
 
+    describe 'kaminari:config' do
+      it_should_exist 'config/initializers/kaminari_config.rb'
+    end
+
     describe 'copying layout' do
       it_should_exist 'app/views/layouts/admin/application.html.erb'
       it_should_exist 'app/views/layouts/admin/_messages.html.erb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin-panel
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michał Matyas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,8 +136,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 description: Generates Twitter Bootstrap based admin panel with scaffolder. Project
-  is quite opinionated, requires Rails 4, SASS, SimpleForm and Devise.
+  is quite opinionated, requires Rails 4, SASS, SimpleForm, Kaminari and Devise.
 email:
 - michal@higher.lv
 executables: []
@@ -161,13 +175,34 @@ files:
 - lib/generators/admin_panel/install/templates/controllers/admin/sessions_controller.rb
 - lib/generators/admin_panel/install/templates/controllers/concerns/administrable.rb
 - lib/generators/admin_panel/install/templates/helpers/admin_helper.rb
-- lib/generators/admin_panel/install/templates/layouts/admin/_messages.html.erb
-- lib/generators/admin_panel/install/templates/layouts/admin/_navigation.html.erb
-- lib/generators/admin_panel/install/templates/layouts/admin/application.html.erb
-- lib/generators/admin_panel/install/templates/views/admin/dashboard/index.html.erb
-- lib/generators/admin_panel/install/templates/views/admin/passwords/edit.html.erb
-- lib/generators/admin_panel/install/templates/views/admin/passwords/new.html.erb
-- lib/generators/admin_panel/install/templates/views/admin/sessions/new.html.erb
+- lib/generators/admin_panel/install/templates/layouts/erb/admin/_messages.html.erb
+- lib/generators/admin_panel/install/templates/layouts/erb/admin/_navigation.html.erb
+- lib/generators/admin_panel/install/templates/layouts/erb/admin/application.html.erb
+- lib/generators/admin_panel/install/templates/layouts/haml/admin/_messages.html.haml
+- lib/generators/admin_panel/install/templates/layouts/haml/admin/_navigation.html.haml
+- lib/generators/admin_panel/install/templates/layouts/haml/admin/application.html.haml
+- lib/generators/admin_panel/install/templates/views/erb/admin/dashboard/index.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/admin/passwords/edit.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/admin/passwords/new.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/admin/sessions/new.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_first_page.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_gap.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_last_page.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_next_page.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_page.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_paginator.html.erb
+- lib/generators/admin_panel/install/templates/views/erb/kaminari/admin-bootstrap/_prev_page.html.erb
+- lib/generators/admin_panel/install/templates/views/haml/admin/dashboard/index.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/admin/passwords/edit.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/admin/passwords/new.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/admin/sessions/new.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_first_page.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_gap.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_last_page.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_next_page.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_page.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_paginator.html.haml
+- lib/generators/admin_panel/install/templates/views/haml/kaminari/admin-bootstrap/_prev_page.html.haml
 - lib/generators/admin_panel/scaffold/scaffold_generator.rb
 - lib/generators/admin_panel/scaffold/templates/controllers/controller.rb.erb
 - lib/generators/admin_panel/scaffold/templates/views/erb/_form.html.erb.erb
@@ -175,6 +210,11 @@ files:
 - lib/generators/admin_panel/scaffold/templates/views/erb/index.html.erb.erb
 - lib/generators/admin_panel/scaffold/templates/views/erb/new.html.erb.erb
 - lib/generators/admin_panel/scaffold/templates/views/erb/show.html.erb.erb
+- lib/generators/admin_panel/scaffold/templates/views/haml/_form.html.haml.erb
+- lib/generators/admin_panel/scaffold/templates/views/haml/edit.html.haml.erb
+- lib/generators/admin_panel/scaffold/templates/views/haml/index.html.haml.erb
+- lib/generators/admin_panel/scaffold/templates/views/haml/new.html.haml.erb
+- lib/generators/admin_panel/scaffold/templates/views/haml/show.html.haml.erb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css

data/lib/generators/admin_panel/install/templates/views/admin/dashboard/index.html.erb

@@ -1 +0,0 @@
-<h1>Dashboard goes here</h1>