kaui 0.11.0 → 0.12.0

data/app/views/kaui/accounts/show.html.erb

@@ -1,110 +1,8 @@
-<h3 class="pageHeader">Account: <%= link_to "Billing timeline", kaui_engine.account_timeline_path(@account.account_id) %></h3>
+<%= render :partial => 'account_info' %>
 
-<dl class="dl-horizontal">
-  <dt>Id:</dt>
-  <dd><%= @account.account_id %>&nbsp;</dd>
-  <dt>Name:</dt>
-  <dd><%= @account.name %>&nbsp;</dd>
-  <dt>Email:</dt>
-  <dd><%= @account.email %>&nbsp;</dd>
-  <dt>Bill cycle day:</dt>
-  <% if @account.bill_cycle_day_local %>
-      <dd><%= @account.bill_cycle_day_local %> (user timezone)</dd>
-  <% else %>
-      <dd><%= t :unknown_bcd %></dd>
-  <% end %>
-  <dt>Currency:</dt>
-  <dd><%= @account.currency %>&nbsp;</dd>
-  <dt>Timezone:</dt>
-  <dd><%= @account.time_zone %>&nbsp;</dd>
-  <dt>Address 1:</dt>
-  <dd><%= @account.address1 %>&nbsp;</dd>
-  <dt>Address 2:</dt>
-  <dd><%= @account.address2 %>&nbsp;</dd>
-  <dt>Company:</dt>
-  <dd><%= @account.company %>&nbsp;</dd>
-  <dt>State:</dt>
-  <dd><%= @account.state %>&nbsp;</dd>
-  <dt>Country:</dt>
-  <dd><%= @account.country %>&nbsp;</dd>
-  <dt>Phone:</dt>
-  <dd><%= @account.phone %>&nbsp;</dd>
-  <dt>External key:</dt>
-  <dd><%= @account.external_key %>&nbsp;</dd>
-  <dt>Overdue status:</dt>
-  <% if @overdue_state.nil? %>
-      <dd>unknown</dd>
-  <% elsif @overdue_state.clear_state %>
-      <dd><span class='label label-success'>Good</span>
-      <dd>
-  <% else %>
-      <dd><span class='label label-important'><%= @overdue_state.name %></span>
-      <dd>
-  <% end %>
-  <dt>Account balance:</dt>
-  <% if @account.account_balance.nil? %>
-      <dd>unknown</dd>
-  <% elsif @account.account_balance <= 0 %>
-      <dd><span class="label label-success"><%= humanized_money_with_symbol @account.balance_to_money %>
-        (<%= @account.currency %>)</span>
-  <% else %>
-      <dd><span class="label label-important"><%= humanized_money_with_symbol @account.balance_to_money %>
-        (<%= @account.currency %>)</span>
-  <% end %>
-  &nbsp;
-  <nobr>
-    <!-- Payment, Credit then Charge. Same ordering as in the billing timeline -->
-    <%= link_to 'Payment',
-                kaui_engine.pay_all_invoices_account_path(@account.account_id),
-                :method => :post,
-                :class  => "btn btn-xs #{"disabled" if !@account.account_balance.nil? and @account.account_balance <= 0}" %>
-  </nobr>
-  <% if can? :credit, Kaui::Account %>
-      <nobr>
-        <%= link_to 'Credit',
-                    kaui_engine.new_credit_path(:params => {:account_id => @account.account_id}),
-                    :class => "btn btn-xs" %>
-      </nobr>
-  <% end %>
-  <% if can? :charge, Kaui::Account %>
-      <nobr>
-        <%= link_to 'Charge',
-                    kaui_engine.new_charge_path(:params => {:account_id => @account.account_id}),
-                    :class => "btn btn-xs" %>
-      </nobr>
-  <% end %>
-  </dd>
-  <dt>Account credit:</dt>
-  <% if @account.account_cba.nil? %>
-      <dd>unknown
-  <% elsif @account.account_cba >= 0 %>
-      <dd><span class="label label-success"><%= humanized_money_with_symbol @account.cba_to_money %>
-        (<%= @account.currency %>)</span>
-  <% else %>
-      <dd><span class="label label-important"><%= humanized_money_with_symbol @account.cba_to_money %>
-        (<%= @account.currency %>)</span>
-  <% end %>
-  </dd>
-  <dt>Notified for inv?</dt>
-  <dd><%= @account.is_notified_for_invoices %>&nbsp;<%= link_to "Toggle", kaui_engine.toggle_email_notifications_account_path(@account.account_id, :is_notified => !@account.is_notified_for_invoices), :method => :post, :class => 'btn btn-xs' %></dd>
-  <%= render :partial => "kaui/tags/tags_table",
-             :locals  => {:tags => @tags, :tags_url_or_path => kaui_engine.edit_account_tags_path(:params => {:account_id => @account.account_id}), :tags_show_path => kaui_engine.account_tags_path(:account_id => @account.account_id)} %>
-  <%= render :partial => "kaui/account_emails/account_emails_table",
-             :locals  => {:account_emails => @account_emails, :account_id => @account.account_id} %>
-  <dt>New base subscription:</dt>
-  <dd><%= link_to "Create", kaui_engine.new_subscription_path(:params => {:account_id => @account.account_id, :product_category => "BASE"}), :class => "btn btn-xs" %></dd>
-</dl>
-<% if @payment_methods.present? %>
-    <%= render :partial => "kaui/payment_methods/payment_methods_table", :locals => {:account_id => @account.account_id, :payment_methods => @payment_methods} %>
-<% end %>
-<%= link_to "Add payment method", kaui_engine.new_payment_method_path(:account_id => @account.account_id), :class => "btn btn-xs" %>
-<% @bundles.each do |bundle| %>
-    <% subs = @subscriptions_by_bundle_id[bundle.bundle_id] %>
-    <% if subs.present? %>
-        <h2>Bundle <%= link_to Kaui.bundle_key_display_string.call(bundle.external_key), Kaui.bundle_home_path.call(bundle.bundle_id) if bundle.external_key.present? %></h2>
-        <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => {:subscriptions => subs, :account => @account} %>
-    <% end %>
-<% end %>
+<%= render :partial => 'billing_info' %>
+
+<%= render :partial => 'payment_methods' %>
 
 <%= javascript_tag do %>
   function disableLinks() {

data/app/views/kaui/admin_allowed_users/_form.html.erb

@@ -0,0 +1,19 @@
+<%= form_for @allowed_user, :url => admin_allowed_users_path, :html => {:class => 'form-horizontal'} do |f| %>
+    <div class="form-group">
+      <%= f.label :kb_username, 'Name', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :kb_username, :class => 'form-control', :required => true %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :description, 'Description', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :description, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= f.submit 'Save', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>

data/app/views/kaui/admin_allowed_users/index.html.erb

@@ -1,23 +1,40 @@
-<% if can? :view, Kaui::AdminTenant %>
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Kaui users
+      <% if can? :create, Kaui::AdminTenant %>
+          <%= link_to '&nbsp;<i class="fa fa-plus-square"></i>'.html_safe, new_admin_allowed_user_path %>
+      <% end %></h1>
+
     <% unless @allowed_users.empty? %>
-    <table id="allowed-users-table" class="table table-condensed">
-      <thead>
-      <tr>
-        <th>Name</th>
-        <th>Description</th>
-      </tr>
-      </thead>
-      <tbody>
-      <% @allowed_users.each do |u | %>
+        <table id="allowed-users-table" class="table table-condensed table-striped mobile-data">
+          <thead>
           <tr>
-            <td><%= link_to u.kb_username, admin_allowed_user_path(u.id) %></td>
-            <td><%= u.description %></td>
+            <th>Name</th>
+            <th>Description</th>
           </tr>
-      <% end %>
-      </tbody>
-    </table>
+          </thead>
+          <tbody>
+          <% @allowed_users.each do |u| %>
+              <tr>
+                <td><%= link_to u.kb_username, admin_allowed_user_path(u.id) %></td>
+                <td><%= u.description %></td>
+              </tr>
+          <% end %>
+          </tbody>
+        </table>
     <% end %>
-<% end %>
-<% if can? :create, Kaui::AdminTenant %>
-<h3><%= link_to 'Add a new Allowed User', new_admin_allowed_user_path %></h3>
+
+  </div>
+
+</div>
+
+<%= javascript_tag do %>
+  $(document).ready(function() {
+      $('#allowed-users-table').dataTable({
+      "dom": "t",
+      "paging": false
+    });
+  });
 <% end %>

data/app/views/kaui/admin_allowed_users/new.html.erb

@@ -1,22 +1,10 @@
-<% if can? :create, Kaui::AdminTenant %>
-    <%= form_for @allowed_user, url: admin_allowed_users_path, :html => {:class => 'form-horizontal'} do |f| %>
-        <fieldset>
-          <div class="control-group">
-            <%= f.label :kb_username, 'Name', :class => 'control-label' %>
-            <div class="controls">
-              <%= f.text_field :kb_username, :class => 'input-sm', :required => true %>
-            </div>
-          </div>
-          <div class="control-group">
-            <%= f.label :description, 'Description', :class => 'control-label' %>
-            <div class="controls">
-              <%= f.text_field :description, :class => 'input-sm', :required => false %>
-            </div>
-          </div>
-          <div class="form-actions">
-            <%= button_tag 'Configure a new Allowed User', :class => 'btn btn-primary' %>
-          </div>
-        </fieldset>
-    <% end %>
-<% end %>
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
 
+    <div class="column-block">
+      <h1>Add new user</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

data/app/views/kaui/admin_allowed_users/show.html.erb

@@ -1,53 +1,45 @@
-<% if can? :view, Kaui::AdminTenant %>
-    <dl class="dl-horizontal">
-      <dt>Name:</dt>
-      <dd><%= @allowed_user.kb_username %>&nbsp;</dd>
-      <dt>Tenant ID:</dt>
-      <dd><%= @allowed_user.description %>&nbsp;</dd>
-    </dl>
-
-    <% unless @allowed_user.kaui_tenants.empty? %>
-        <h3>Configured tenants:</h3>
-        <table id="allowed-user-tenants-table" class="table table-condensed">
-          <thead>
-          <tr>
-            <th>Name</th>
-            <th>Tenant Id</th>
-            <th>Api Key</th>
-          </tr>
-          </thead>
-          <tbody>
-          <% @allowed_user.kaui_tenants.each do |t| %>
-              <tr>
-                <td><%= link_to t.name, admin_tenant_path(t.id) %></td>
-                <td><%= t.kb_tenant_id %></td>
-                <td><%= t.api_key %></td>
-              </tr>
-          <% end %>
-          </tbody>
-        </table>
-    <% end %>
-<% end %>
+<div class="column-block">
 
-<% if can? :create, Kaui::AdminTenant %>
-    <%= form_for(@allowed_user, :url => {:action => :add_tenant}, :html => {:method => :post, :class => "form-horizontal"}) do |f| %>
-
-        <fieldset>
-          <%= f.hidden_field(:id) %>
-          <div class="control-group">
-            <%= label_tag :tenant_name, "Available Tenants:", :class => "control-label" %>
-            <div class="controls">
-              <%= select_tag :tenant_id, options_for_select(@tenants.map { |t| [t.name, t.id] }) %>
-            </div>
-          </div>
-          <div class="form-actions">
-            <%= f.submit 'Chose Tenant', :class => 'btn btn-primary' %>
-            <%= link_to 'Back', :back, :class => 'btn' %>
-          </div>
-        </fieldset>
-    <% end %>
-<% end %>
+  <h1>User details</h1>
+
+  <b>Name:</b> <%= @allowed_user.kb_username %>
+  <br/>
+  <b>Description:</b> <%= @allowed_user.description %>
 
-<div class="form-actions">
-  <%= link_to 'Back', :back, :class => 'btn' %>
 </div>
+
+<% if can? :create, Kaui::AdminTenant %>
+    <div class="register">
+      <div class="col-md-8 col-md-offset-2">
+
+        <div class="column-block">
+          <h1>Configured tenants</h1>
+          <%= form_for @allowed_user, :url => {:action => :add_tenant}, :html => {:method => :post, :class => 'form-horizontal'} do |f| %>
+              <%= f.hidden_field(:id) %>
+
+              <div class='form-group'>
+                <div class="col-sm-offset-2 col-sm-10">
+                  <% @tenants.each do |tenant| %>
+                      <div class="checkbox">
+                        <label>
+                          <%= check_box_tag "tenant_#{tenant.id}", tenant.id, @allowed_user.kaui_tenants.map(&:id).include?(tenant.id), :disabled => Kaui.root_username != current_user.kb_username %>
+                          <span><%= tenant.name || tenant.api_key %></span>
+                        </label>
+                      </div>
+                  <% end %>
+                </div>
+              </div>
+              <% unless Kaui.root_username != current_user.kb_username %>
+                  <div class="form-group">
+                    <div class="col-sm-offset-2 col-sm-10">
+                      <%= f.submit 'Save', :class => 'btn btn-default' %>
+                    </div>
+                  </div>
+              <% end %>
+          <% end %>
+
+        </div>
+
+      </div>
+    </div>
+<% end %>

data/app/views/kaui/admin_tenants/_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_for @tenant, :url => admin_tenants_path, :html => {:class => 'form-horizontal'} do |f| %>
+    <div class="form-group">
+      <%= f.label :name, 'Name', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :name, :class => 'form-control', :required => true %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :api_key, 'API Key', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :api_key, :class => 'form-control', :required => true %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :api_secret, 'API Secret', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.password_field :api_secret, :class => 'form-control', :required => true %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= f.submit 'Save', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>

data/app/views/kaui/admin_tenants/_tenants_table.html.erb

@@ -0,0 +1,27 @@
+<table id="tenants-table" class="table table-condensed table-striped mobile-data">
+  <thead>
+  <tr>
+    <th>Name</th>
+    <th>Tenant Id</th>
+    <th>Api Key</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% tenants.each do |t| %>
+      <tr>
+        <td><%= link_to t.name || t.api_key, admin_tenant_path(t.id) %></td>
+        <td><%= t.kb_tenant_id %></td>
+        <td><%= t.api_key %></td>
+      </tr>
+  <% end %>
+  </tbody>
+</table>
+
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $('#tenants-table').dataTable({
+      "dom": "t",
+      "paging": false
+    });
+  });
+<% end %>

data/app/views/kaui/admin_tenants/index.html.erb

@@ -1,25 +1,16 @@
-<% if can? :view, Kaui::AdminTenant %>
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Kaui tenants
+      <% if can? :create, Kaui::AdminTenant %>
+          <%= link_to '&nbsp;<i class="fa fa-plus-square"></i>'.html_safe, new_admin_tenant_path %>
+      <% end %></h1>
+
     <% unless @tenants.empty? %>
-        <table id="tenants-table" class="table table-condensed">
-          <thead>
-          <tr>
-            <th>Name</th>
-            <th>Tenant Id</th>
-            <th>Api Key</th>
-          </tr>
-          </thead>
-          <tbody>
-          <% @tenants.each do |t| %>
-              <tr>
-                <td><%= link_to t.name, admin_tenant_path(t.id) %></td>
-                <td><%= t.kb_tenant_id %></td>
-                <td><%= t.api_key %></td>
-              </tr>
-          <% end %>
-          </tbody>
-        </table>
+        <%= render :partial => 'kaui/admin_tenants/tenants_table', :locals => {:tenants => @tenants} %>
     <% end %>
-<% end %>
-<% if can? :create, Kaui::AdminTenant %>
-    <h3><%= link_to 'Configure a New Tenant', new_admin_tenant_path %></h3>
-<% end %>
+
+  </div>
+
+</div>

data/app/views/kaui/admin_tenants/new.html.erb

@@ -1,39 +1,10 @@
-<% if can? :create, Kaui::AdminTenant %>
-    <%= form_for @tenant, url: admin_tenants_path, :html => {:class => 'form-horizontal'} do |f| %>
-        <fieldset>
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
 
-          <div class="control-group">
-            <%= f.label :name, 'Name', :class => 'control-label' %>
-            <div class="controls">
-              <%= f.text_field :name, :class => 'input-sm', :required => true %>
-            </div>
-          </div>
+    <div class="column-block">
+      <h1>Add new tenant</h1>
+      <%= render 'form' %>
+    </div>
 
-
-          <div class="control-group">
-            <%= f.label :api_key, 'API Key', :class => 'control-label' %>
-            <div class="controls">
-              <%= f.text_field :api_key, :class => 'input-sm', :required => true %>
-            </div>
-          </div>
-
-          <div class="control-group">
-            <%= f.label :api_secret, 'API Secret', :class => 'control-label' %>
-            <div class="controls">
-              <%= f.password_field :api_secret, :class => 'input-sm', :required => true %>
-            </div>
-          </div>
-
-          <div class="control-group">
-            <%= f.label :create_tenant, 'Create tenant', :class => 'control-label' %>
-            <div class="controls">
-              <%= check_box_tag(:create_tenant) %>
-            </div>
-          </div>
-
-          <div class="form-actions">
-            <%= button_tag 'Configure a new Tenant', :class => 'btn btn-primary' %>
-          </div>
-        </fieldset>
-    <% end %>
-<% end %>
+  </div>
+</div>