kadmin 0.3.1 → 0.3.2

data/app/helpers/kadmin/pagination_helper.rb

@@ -1,95 +1,95 @@
-module Kadmin
-  module PaginationHelper
-    # @param [Kadmin::Pager] pager context to paginate
-    # @param [Array<Integer>] sizes array of page sizes
-    def paginate(pager, sizes)
-      return content_tag(:div, pagination_page_list(pager) + pagination_size_list(pager, sizes), class: 'btn-toolbar')
-    end
-
-    # Page Links
-    # Always include:
-    # => Previous page, first, last, next
-    # If we're over page 10, at ... after previous link
-    # If there aren't showing the last page yet, add ... before next link
-    def pagination_page_list(pager)
-      links = []
-      window = (pager.current_page - 2)..(pager.current_page + 2)
-
-      window = Range.new(0, window.end - window.begin) if window.begin.negative?
-      window = Range.new(window.begin, pager.pages - 1) if window.end >= pager.pages
-
-      first_link = pagination_navigate_link(pager, 0, '&laquo;')
-      previous_link = pagination_navigate_link(pager, pager.current_page - 1, '&lsaquo;')
-      last_link = pagination_navigate_link(pager, pager.pages - 1, '&raquo;')
-      next_link = pagination_navigate_link(pager, pager.current_page + 1, '&rsaquo;')
-
-      if pager.previous_page?(window.begin)
-        links << pagination_non_link('&hellip;', 'disabled')
-      end
-
-      window.each do |number|
-        links << pagination_page_link(number, pager)
-      end
-
-      if pager.next_page?(window.end)
-        links << pagination_non_link('&hellip;', 'disabled')
-      end
-
-      links.unshift(first_link, previous_link)
-      links << next_link
-      links << last_link
-
-      return content_tag(:div, links.reduce(&:+), class: 'btn-group')
-    end
-    private :pagination_page_list
-
-    def pagination_non_link(text, css_classes = nil)
-      classes = %w(btn btn-default) + Array.wrap(css_classes)
-      return content_tag(:div, text.to_s.html_safe, class: classes.join(' '))
-    end
-    private :pagination_non_link
-
-    def pagination_link(text, options = {}, css_classes = nil)
-      classes = %w(btn btn-default) + Array.wrap(css_classes)
-      return link_to(text.to_s.html_safe, params.merge(options), class: classes.join(' '))
-    end
-    private :pagination_link
-
-    def pagination_page_link(page, pager)
-      link = if pager.current_page?(page)
-        pagination_non_link(page + 1, 'active')
-      else
-        pagination_link(page + 1, page_offset: pager.offset_at(page))
-      end
-
-      return link
-    end
-    private :pagination_page_link
-
-    def pagination_navigate_link(pager, page, text)
-      link = if pager.contains?(page)
-        pagination_link(text, page_offset: pager.offset_at(page))
-      else
-        pagination_non_link(text, 'disabled')
-      end
-
-      return link
-    end
-    private :pagination_navigate_link
-
-    # Page Sizes
-    def pagination_size_list(pager, sizes)
-      label = content_tag(:div, 'Per page: ', class: 'btn')
-      links = sizes.map do |size|
-        if pager.size == size
-          pagination_non_link(size, 'active')
-        else
-          pagination_link(size, page_size: size)
-        end
-      end.reduce(&:+)
-
-      return content_tag(:div, label + links, class: 'btn-group')
-    end
-    private :pagination_size_list
-  end
-end
+module Kadmin
+  module PaginationHelper
+    # @param [Kadmin::Pager] pager context to paginate
+    # @param [Array<Integer>] sizes array of page sizes
+    def paginate(pager, sizes)
+      return content_tag(:div, pagination_page_list(pager) + pagination_size_list(pager, sizes), class: 'btn-toolbar')
+    end
+
+    # Page Links
+    # Always include:
+    # => Previous page, first, last, next
+    # If we're over page 10, at ... after previous link
+    # If there aren't showing the last page yet, add ... before next link
+    def pagination_page_list(pager)
+      links = []
+      window = (pager.current_page - 2)..(pager.current_page + 2)
+
+      window = Range.new(0, window.end - window.begin) if window.begin.negative?
+      window = Range.new(window.begin, pager.pages - 1) if window.end >= pager.pages
+
+      first_link = pagination_navigate_link(pager, 0, '&laquo;')
+      previous_link = pagination_navigate_link(pager, pager.current_page - 1, '&lsaquo;')
+      last_link = pagination_navigate_link(pager, pager.pages - 1, '&raquo;')
+      next_link = pagination_navigate_link(pager, pager.current_page + 1, '&rsaquo;')
+
+      if pager.previous_page?(window.begin)
+        links << pagination_non_link('&hellip;', 'disabled')
+      end
+
+      window.each do |number|
+        links << pagination_page_link(number, pager)
+      end
+
+      if pager.next_page?(window.end)
+        links << pagination_non_link('&hellip;', 'disabled')
+      end
+
+      links.unshift(first_link, previous_link)
+      links << next_link
+      links << last_link
+
+      return content_tag(:div, links.reduce(&:+), class: 'btn-group')
+    end
+    private :pagination_page_list
+
+    def pagination_non_link(text, css_classes = nil)
+      classes = %w(btn btn-default) + Array.wrap(css_classes)
+      return content_tag(:div, text.to_s.html_safe, class: classes.join(' '))
+    end
+    private :pagination_non_link
+
+    def pagination_link(text, options = {}, css_classes = nil)
+      classes = %w(btn btn-default) + Array.wrap(css_classes)
+      return link_to(text.to_s.html_safe, params.merge(options), class: classes.join(' '))
+    end
+    private :pagination_link
+
+    def pagination_page_link(page, pager)
+      link = if pager.current_page?(page)
+        pagination_non_link(page + 1, 'active')
+      else
+        pagination_link(page + 1, page_offset: pager.offset_at(page))
+      end
+
+      return link
+    end
+    private :pagination_page_link
+
+    def pagination_navigate_link(pager, page, text)
+      link = if pager.contains?(page)
+        pagination_link(text, page_offset: pager.offset_at(page))
+      else
+        pagination_non_link(text, 'disabled')
+      end
+
+      return link
+    end
+    private :pagination_navigate_link
+
+    # Page Sizes
+    def pagination_size_list(pager, sizes)
+      label = content_tag(:div, 'Per page: ', class: 'btn')
+      links = sizes.map do |size|
+        if pager.size == size
+          pagination_non_link(size, 'active')
+        else
+          pagination_link(size, page_size: size)
+        end
+      end.reduce(&:+)
+
+      return content_tag(:div, label + links, class: 'btn-group')
+    end
+    private :pagination_size_list
+  end
+end

data/app/views/kadmin/auth/login.html.erb

@@ -1,4 +1,4 @@
-<div style='text-align: center; margin-top: 1em'>
-  <p><%= link_to(t('kadmin.auth.please_login'), omniauth_provider_link) %></p>
-  <p><%= t('kadmin.auth.login_required') %></p>
-</div>
+<div style='text-align: center; margin-top: 1em'>
+  <p><%= link_to(t('kadmin.auth.please_login'), omniauth_provider_link) %></p>
+  <p><%= t('kadmin.auth.login_required') %></p>
+</div>

data/app/views/kadmin/components/_finder.html.erb

@@ -1,18 +1,14 @@
-<%= render partial: 'kadmin/components/finder/header', locals: { finder: finder } %>
-
-<div class='container-fluid'>
-  <% if finder.filters.present? %>
-    <div class='row'>
-      <%= render partial: 'kadmin/components/finder/form', locals: { finder: finder } %>
-    </div>
-  <% end %>
-
-  <div class='row' style='padding-top: 15px'>
-    <% if finder.results.empty? %>
-      <%= render partial: 'kadmin/components/finder/empty', locals: { finder: finder } %>
-    <% else %>
-      <%= yield %>
-      <%= paginate(finder.pager, [15, 30, 50, 100]) %>
-    <% end %>
-  </div>
-</div>
+<%= render partial: 'kadmin/components/finder/header', locals: { finder: finder } %>
+
+<div class='container-fluid'>
+  <div class='row' style='padding-top: 15px'>
+    <% if finder.results.empty? %>
+      <%= render partial: 'kadmin/components/finder/empty', locals: { finder: finder } %>
+    <% else %>
+      <%= yield %>
+      <% if finder.results.size > 50 %>
+        <%= paginate(finder.pager, [50, 100, 1000]) %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/kadmin/components/finder/_empty.html.erb

@@ -1,3 +1,3 @@
-<div class='jumbotron'>
-  <p><%= t('kadmin.components.finder.empty') %></p>
-</div>
+<div class='jumbotron'>
+  <p><%= t('kadmin.components.finder.empty') %></p>
+</div>

data/app/views/kadmin/components/finder/_form.erb

@@ -1,10 +1,10 @@
-<%= form_tag(request.path, method: 'get', class: 'form-inline') do %>
-  <div class='form-group'>
-    <%= link_to(t('kadmin.components.finder.create'), url_for(action: :new), class: 'btn btn-primary') %>
-    <% finder.filters.each do |name, filter| %>
-      <%= text_field_tag("filter_#{name}", filter&.value, class: 'form-control', placeholder: "Filter by #{name}...") %>
-    <% end %>
-    <%= submit_tag(t('kadmin.components.finder.filter'), class: 'btn btn-default form-control') %>
-    <%= link_to(t('kadmin.components.finder.clear'), request.path, class: 'btn btn-danger form-control') %>
-  </div>
-<% end %>
+<%= form_tag(request.path, method: 'get', class: 'form-inline pull-right') do %>
+  <div class='form-group'>
+    <%= link_to(t('kadmin.components.finder.create'), url_for(action: :new), class: 'btn btn-primary', style: 'margin-right: 20px') %>
+    <% finder.filters.each do |name, filter| %>
+      <%= text_field_tag("filter_#{name}", filter&.value, class: 'form-control', placeholder: "Filter by #{name}...") %>
+    <% end %>
+    <%= submit_tag(t('kadmin.components.finder.filter'), class: 'btn btn-default form-control') %>
+    <!--<%= link_to(t('kadmin.components.finder.clear'), request.path, class: 'btn btn-danger form-control') %>-->
+  </div>
+<% end %>

data/app/views/kadmin/components/finder/_header.html.erb

@@ -1,11 +1,14 @@
-<div class="page-header">
-  <h2>
-    <%= finder.currently_showing %>
-    <% unless finder.empty? %>
-      <small>
-        <%= t('kadmin.components.finder.out_of', total: finder.pager.total) %>
-        <%= finder.applied_filters %>
-      </small>
-    <% end %>
-  </h2>
-</div>
+<div class="card-title-block">
+  <h3 class="title">
+      <%= finder.currently_showing %>
+      <% unless finder.empty? %>
+        (
+          <%= t('kadmin.components.finder.out_of', total: finder.pager.total) %>
+          <%= finder.applied_filters %>
+        )
+      <% end %>
+      <% if finder.filters.present? %>
+        <%= render partial: 'kadmin/components/finder/form', locals: { finder: finder } %>
+      <% end %>
+  </h3>
+</div>

data/app/views/kadmin/dash/index.html.erb

@@ -1,5 +1,5 @@
-<div class='jumbotron' style='margin-top: 1em;'>
-  <h1 class='display-3'><%= t('kadmin.welcome', user: current_user) %></h1>
-  <hr class='m-y-2'>
-  <p><%= t('kadmin.dash_message') %></p>
-</div>
+<div class='jumbotron' style='margin-top: 1em;'>
+  <h3 class=''><%= t('kadmin.welcome', user: current_user) %></h3>
+  <hr class='m-y-2'>
+  <p><%= t('kadmin.dash_message') %></p>
+</div>

data/app/views/kadmin/error.html.erb

@@ -1,5 +1,5 @@
-<div class='jumbotron' style='margin-top: 1em'>
-  <h1 class='display-3'><%= title %></h1>
-  <hr class='m-y-2'>
-  <p><%= message %></p>
-</div>
+<div class='jumbotron' style='margin-top: 1em'>
+  <h1 class='display-3'><%= title %></h1>
+  <hr class='m-y-2'>
+  <p><%= message %></p>
+</div>

data/app/views/kadmin/helpers/_alerts.html.erb

@@ -1,4 +1,4 @@
-<div class='alerts'>
-  <%= render_flash_alerts %>
-  <%= yield :flash_alerts %>
-</div>
+<div class='alerts'>
+  <%= render_flash_alerts %>
+  <%= yield :flash_alerts %>
+</div>

data/app/views/kadmin/helpers/_form_errors.html.erb

@@ -1,10 +1,10 @@
-<% if model.errors.present? %>
-  <%= alert('danger') do %>
-    <p><%= glyphicon('exclamation-sign') %> <%= t('kadmin.forms.please_correct') %></p>
-    <ul>
-      <% model.errors.full_messages.each do |message| %>
-        <li><%= message.html_safe %></li>
-      <% end %>
-    </ul>
-  <% end %>
-<% end %>
+<% if model.errors.present? %>
+  <%= alert('danger') do %>
+    <p><%= glyphicon('exclamation-sign') %> <%= t('kadmin.forms.please_correct') %></p>
+    <ul>
+      <% model.errors.full_messages.each do |message| %>
+        <li><%= message.html_safe %></li>
+      <% end %>
+    </ul>
+  <% end %>
+<% end %>

data/app/views/layouts/modular/application.html.erb

@@ -1,133 +1,135 @@
-<!doctype html>
-<html class="no-js" lang="en">
-
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <title>Apps/Services Admin</title>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="apple-touch-icon" href="apple-touch-icon.png">
-        <!-- Place favicon.ico in the root directory -->
-        <%= stylesheet_link_tag "modular/vendor.css", media: "all" %>
-        <%= stylesheet_link_tag "modular/app-blue.css", media: "all" %>
-        <%= stylesheet_link_tag "modular/custom.css", media: "all" %>
-        <%= csrf_meta_tags %>
-        <!-- Additional scripts -->
-        <%= javascript_include_tag "modular/application.js" %>
-        <%= javascript_include_tag "modular/custom.js" %>
-    </head>
-
-    <body>
-        <div class="main-wrapper">
-            <div class="app" id="app">
-                <header class="header">
-                    <h3 class="title" style="margin-left: 40px;"> Moin, moin! </h3>
-                    <div class="header-block header-block-nav">
-                        <ul class="nav-profile">
-                            <% if logged_in? %>
-                                <%= link_to(t('kadmin.authorization.logout'), Kadmin::Engine.routes.url_helpers.auth_logout_path) %>
-                            <% end %>
-                            <li class="profile dropdown">
-
-                                <!--<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-                                    <div class="img" style="background-image: url('https://avatars3.githubusercontent.com/u/3959008?v=3&s=40')"> </div>
-                                    <span class="name">John Doe</span>
-                                </a>
-                                <div class="dropdown-menu profile-dropdown-menu" aria-labelledby="dropdownMenu1">
-                                    <a class="dropdown-item" href="#"> <i class="fa fa-user icon"></i> Profile </a>
-                                    <a class="dropdown-item" href="#"> <i class="fa fa-bell icon"></i> Notifications </a>
-                                    <a class="dropdown-item" href="#"> <i class="fa fa-gear icon"></i> Settings </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="login.html"> <i class="fa fa-power-off icon"></i> Logout </a>
-                                </div>-->
-                            </li>
-                        </ul>
-                    </div>
-                </header>
-                <aside class="sidebar">
-                    <div class="sidebar-container">
-                        <div class="sidebar-header">
-                            <div class="brand">
-                                <!--<div class="logo"> <span class="l l1"></span> <span class="l l2"></span> <span class="l l3"></span> <span class="l l4"></span> <span class="l l5"></span> </div>-->
-                                <a class="titlelink" href="/admin">Apps&amp;Services Admin</a> </div>
-                        </div>
-                        <nav class="menu">
-                            <ul class="nav metismenu" id="sidebar-menu">
-
-                                <% unless @layout_navbar_links.blank? %>
-                                    <% @layout_navbar_links.each do |link| %>
-                                        <%= nav_link_to(link[:title], link[:path]) %>
-                                    <% end %>
-                                <% end %>
-                                <!--<li class="active">
-                                    <a href="index.html"> <i class="fa fa-home"></i> Dashboard </a>
-                                </li>
-                                <li>
-                                    <a href=""> <i class="fa fa-th-large"></i> Items Manager <i class="fa arrow"></i> </a>
-                                    <ul>
-                                        <li> <a href="items-list.html">
-    								Items List
-    							</a> </li>
-                                        <li> <a href="item-editor.html">
-    								Item Editor
-    							</a> </li>
-                                    </ul>
-                                </li>-->
-                            </ul>
-                        </nav>
-                    </div>
-                </aside>
-                <div class="sidebar-overlay" id="sidebar-overlay"></div>
-                <article class="content dashboard-page">
-                    <div class="row">
-                        <% if content_for?(:sidebar) %>
-                        <div class="col-xl-8">
-                            <!-- main -->
-                            <%= render partial: 'kadmin/helpers/alerts' %>
-                            <%= yield %>
-                        </div>
-                        <div class="col-xl-4 helpsidebar">
-                            <!-- sidebar -->
-                            <div class="card card-default">
-                                <div class="card-header">
-                                    <div class="header-block">
-                                        <p class="title">Help</p>
-                                    </div>
-                                </div>
-                                <div class="card-block">
-                                    <%= yield(:sidebar) %>
-                                </div>
-                                <!--<div class="card-footer"> Card Footer </div>-->
-                            </div>
-                        </div>
-                        <% else %>
-                        <div class="col-sm-12">
-                            <%= render partial: 'kadmin/helpers/alerts' %>
-                            <%= yield %>
-                        </div>
-                        <% end %>
-                    </div>
-                </article>
-                <footer class="footer">
-                    <div class="footer-block buttons">  </div>
-                    <div class="footer-block author">
-                        <ul>
-                            <li> Problems? <a href="https://redmine.offerista.com/projects/apps-services/issues/new">Create a Ticket</a> </li>
-                        </ul>
-                    </div>
-                </footer>
-            </div>
-        </div>
-        <!-- Reference block for JS -->
-        <div class="ref" id="ref">
-            <div class="color-primary"></div>
-            <div class="chart">
-                <div class="color-primary"></div>
-                <div class="color-secondary"></div>
-            </div>
-        </div>
-        <%= yield :javascripts %>
-    </body>
-
+<!doctype html>
+<html class="no-js" lang="en">
+
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <title>Apps/Services Admin</title>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="apple-touch-icon" href="apple-touch-icon.png">
+        <!-- Place favicon.ico in the root directory -->
+        <%= stylesheet_link_tag "modular/vendor.css", media: "all" %>
+        <%= stylesheet_link_tag "modular/app-blue.css", media: "all" %>
+        <%= stylesheet_link_tag "modular/custom.css", media: "all" %>
+        <%= yield :stylesheets %>
+        <%= csrf_meta_tags %>
+        <!-- Additional scripts -->
+        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+        <%= javascript_include_tag "modular/application.js" %>
+        <%= javascript_include_tag "modular/custom.js" %>
+    </head>
+
+    <body>
+        <div class="main-wrapper">
+            <div class="app" id="app">
+                <header class="header">
+                    <h3 class="title" style="margin-left: 40px;"> <!--Moin, moin!--> </h3>
+                    <div class="header-block header-block-nav">
+                        <ul class="nav-profile">
+                            <% if logged_in? %>
+                                <%= link_to(t('kadmin.authorization.logout'), Kadmin::Engine.routes.url_helpers.auth_logout_path) %>
+                            <% end %>
+                            <li class="profile dropdown">
+
+                                <!--<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+                                    <div class="img" style="background-image: url('https://avatars3.githubusercontent.com/u/3959008?v=3&s=40')"> </div>
+                                    <span class="name">John Doe</span>
+                                </a>
+                                <div class="dropdown-menu profile-dropdown-menu" aria-labelledby="dropdownMenu1">
+                                    <a class="dropdown-item" href="#"> <i class="fa fa-user icon"></i> Profile </a>
+                                    <a class="dropdown-item" href="#"> <i class="fa fa-bell icon"></i> Notifications </a>
+                                    <a class="dropdown-item" href="#"> <i class="fa fa-gear icon"></i> Settings </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="login.html"> <i class="fa fa-power-off icon"></i> Logout </a>
+                                </div>-->
+                            </li>
+                        </ul>
+                    </div>
+                </header>
+                <aside class="sidebar">
+                    <div class="sidebar-container">
+                        <div class="sidebar-header">
+                            <div class="brand">
+                                <!--<div class="logo"> <span class="l l1"></span> <span class="l l2"></span> <span class="l l3"></span> <span class="l l4"></span> <span class="l l5"></span> </div>-->
+                                <a class="titlelink" href="/admin">Apps&amp;Services Admin</a> </div>
+                        </div>
+                        <nav class="menu">
+                            <ul class="nav metismenu" id="sidebar-menu">
+
+                                <% unless @layout_navbar_links.blank? %>
+                                    <% @layout_navbar_links.each do |link| %>
+                                        <%= nav_link_to(link[:title], link[:path]) %>
+                                    <% end %>
+                                <% end %>
+                                <!--<li class="active">
+                                    <a href="index.html"> <i class="fa fa-home"></i> Dashboard </a>
+                                </li>
+                                <li>
+                                    <a href=""> <i class="fa fa-th-large"></i> Items Manager <i class="fa arrow"></i> </a>
+                                    <ul>
+                                        <li> <a href="items-list.html">
+    								Items List
+    							</a> </li>
+                                        <li> <a href="item-editor.html">
+    								Item Editor
+    							</a> </li>
+                                    </ul>
+                                </li>-->
+                            </ul>
+                        </nav>
+                    </div>
+                </aside>
+                <div class="sidebar-overlay" id="sidebar-overlay"></div>
+                <article class="content dashboard-page">
+                    <div class="row">
+                        <% if content_for?(:sidebar) %>
+                        <div class="col-xl-8">
+                            <!-- main -->
+                            <%= render partial: 'kadmin/helpers/alerts' %>
+                            <%= yield %>
+                        </div>
+                        <div class="col-xl-4 helpsidebar">
+                            <!-- sidebar -->
+                            <div class="card card-default">
+                                <div class="card-header">
+                                    <div class="header-block">
+                                        <p class="title">Help</p>
+                                    </div>
+                                </div>
+                                <div class="card-block">
+                                    <%= yield(:sidebar) %>
+                                </div>
+                                <!--<div class="card-footer"> Card Footer </div>-->
+                            </div>
+                        </div>
+                        <% else %>
+                        <div class="col-sm-12">
+                            <%= render partial: 'kadmin/helpers/alerts' %>
+                            <%= yield %>
+                        </div>
+                        <% end %>
+                    </div>
+                </article>
+                <footer class="footer">
+                    <div class="footer-block buttons">  </div>
+                    <div class="footer-block author">
+                        <ul>
+                            <li> Problems? <a href="https://redmine.offerista.com/projects/apps-services/issues/new">Create a Ticket</a> </li>
+                        </ul>
+                    </div>
+                </footer>
+            </div>
+        </div>
+        <!-- Reference block for JS -->
+        <div class="ref" id="ref">
+            <div class="color-primary"></div>
+            <div class="chart">
+                <div class="color-primary"></div>
+                <div class="color-secondary"></div>
+            </div>
+        </div>
+        <%= yield :javascripts %>
+    </body>
+
 </html>