kaui 0.6.6 → 0.7.0

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

@@ -0,0 +1,116 @@
+<%= form_for @account, :html => {:class => 'form-horizontal'} do |f| %>
+    <fieldset>
+      <div class="control-group">
+        <%= f.label :name, 'Name *', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :name, :class => 'input-small', :required => true %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :first_name_length, 'First name length', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :first_name_length, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :external_key, 'External key *', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :external_key, :class => 'input-small', :required => true %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :email, 'Email *', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :email, :class => 'input-small', :required => true %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :bill_cycle_day_local, 'Bill cycle day', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :bill_cycle_day_local, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :currency, 'Currency', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.select :currency, currencies, {}, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :time_zone, 'Timezone', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.collection_select :time_zone, ActiveSupport::TimeZone.all, :formatted_offset, :to_s, :class => 'input-large' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :address1, 'Address line 1', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :address1, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :address2, 'Address line 2', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :address2, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :postal_code, 'Zip code', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :postal_code, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :company, 'Company', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :company, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :city, 'City', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :city, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :state, 'State', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :state, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :country, 'Country', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.country_select :country, {priority: %w(US CA), prompt: 'Please select a country'}, :class => 'input-large' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :locale, 'Locale', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :locale, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :phone, 'Phone', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :phone, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :is_migrated, 'Migrated?', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.check_box :is_migrated, :class => 'input-small' %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :is_notified_for_invoices, 'Notified for invoices?', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.check_box :is_notified_for_invoices, :class => 'input-small' %>
+        </div>
+      </div>
+
+      <div class="form-actions">
+        <%= button_tag 'Create account', :class => 'btn btn-primary' %>
+      </div>
+    </fieldset>
+<% end %>

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

@@ -1,21 +1,23 @@
 <table id="accounts-table" class="table table-condensed">
   <thead>
-    <tr>
-      <th>Account ID</th>
-      <th>Name</th>
-      <th>External key</th>
-      <th>Currency</th>
-      <th>City</th>
-      <th>Country</th>
-    </tr>
+  <tr>
+    <th>Account ID</th>
+    <th>Name</th>
+    <th>External key</th>
+    <th>Currency</th>
+    <th>City</th>
+    <th>Country</th>
+  </tr>
   </thead>
   <tbody>
-    <tr>
-      <td colspan="1" class="dataTables_empty">Loading data from server</td>
-    </tr>
+  <tr>
+    <td colspan="1" class="dataTables_empty">Loading data from server</td>
+  </tr>
   </tbody>
 </table>
 
+<h3><%= link_to 'Create new account', new_account_path %></h3>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#accounts-table').dataTable({

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

@@ -0,0 +1,5 @@
+<div class="page-header">
+  <h1>New account</h1>
+</div>
+
+<%= render 'form' %>

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

@@ -1,106 +1,108 @@
-<% if @account.present? %>
-  <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 %>
-      <dd><%= @account.bill_cycle_day %> (user timezone)</dd>
-    <% else %>
-      <dd><%=t :unknown_bcd %></dd>
-    <% end %>
-    <dt>Currency:</dt>
-    <dd><%= @account.currency %>&nbsp;</dd>
-    <dt>Timezone:</dt>
-    <dd><%= @account.timezone %>&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.balance.nil? %>
-        <dd>unknown</dd>
-    <% elsif @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-mini #{"disabled" if !@account.balance.nil? and @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-mini" %>
-          </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-mini" %>
-          </nobr>
-        <% end %>
-        </dd>
-    <dt>Account credit:</dt>
-    <% if @account.cba.nil? %>
-        <dd>unknown
-    <% elsif @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-mini' %></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-mini" %></dd>
-  </dl>
-  <h2><%= link_to "Billing timeline", kaui_engine.account_timeline_path(@account.account_id) %></h2>
-  <% if @payment_methods.present? %>
-    <%= render :partial => "kaui/payment_methods/payment_methods_table", :locals => { :account_id => @account.account_id, :payment_methods => @payment_methods } %>
+<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 %>
-  <%= link_to "Add payment method", kaui_engine.add_payment_method_account_path(@account.account_id), :class => "btn btn-mini" %>
-  <% @bundles.each do |bundle| %>
+  &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-mini #{"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-mini" %>
+      </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-mini" %>
+      </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-mini' %></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-mini" %></dd>
+</dl>
+<h2><%= link_to "Billing timeline", kaui_engine.account_timeline_path(@account.account_id) %></h2>
+<% 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-mini" %>
+<% @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 } %>
+        <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 %>
-<% else %>
-  <p>Account not found</p>
 <% end %>
 
 <%= javascript_tag do %>

data/app/views/kaui/bundle_tags/_bundle_tags_table.html.erb

@@ -1,11 +1,31 @@
-<dt>Tags:</dt>
-<dd>
+<div class="page-header">
+  <h3>Tags for <%= (link_to @bundle.external_key, bundle_path(@bundle.bundle_id)) if @bundle.present? %></h3>
+</div>
+<table class="table table-condensed table-striped data-table">
+  <thead>
+  <tr>
+    <th>Tag Name</th>
+    <th>Executed date</th>
+    <th>Execution type</th>
+    <th>Executed by</th>
+    <th>Comments</th>
+  </tr>
+  </thead>
+  <tbody>
   <% if @tags.present? %>
-    <% @tags.sort.each_with_index do |tag, idx| %>
-      <span><%= tag %><% if idx < @tags.length - 1 %>, <% end %></span>
-    <% end %>
-    <br/>
+      <% @tags.each do |tag| %>
+          <% tag.audit_logs.each do |log| %>
+              <tr>
+                <td><%= link_to tag.tag_definition_name, tag_definition_path(:id => tag.tag_definition_id) %></td>
+                <td><%= format_date(log.change_date, @account.time_zone).html_safe if log.change_date.present? %></td>
+                <td><span
+                <% if log.change_type != 'INSERT' %>class='alert-error'
+                <% else %>class='alert-success' <% end %>><%= log.change_type %></span></td>
+                <td><%= log.changed_by %></td>
+                <td><%= log.reason_code %> <%= log.comments %></td>
+              </tr>
+          <% end %>
+      <% end %>
   <% end %>
-  <%= link_to 'Add/Remove', kaui_engine.edit_bundle_tags_path(:params => { :bundle_id => @bundle.bundle_id }),
-                                                              :class => "btn btn-mini" %>
-</dd>
+  </tbody>
+</table>

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

@@ -0,0 +1,41 @@
+<%= form_tag update_bundle_tags_path, :class => 'form-horizontal' do %>
+    <%= hidden_field_tag :bundle_id, @bundle.bundle_id %>
+    <fieldset>
+      <div class="control-group">
+        <label class="control-label">Bundle name</label>
+
+        <div class="controls">
+          <label class="checkbox">
+            <%= link_to @bundle.external_key, Kaui.bundle_home_path.call(@bundle.bundle_id) %><br/>
+          </label>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= label_tag :name, 'Tag', :class => 'control-label' %>
+        <div class="controls">
+          <% @available_tags.each do |tag| %>
+              <label class="checkbox">
+                <%= check_box_tag "tag_#{tag.id}", tag.name, @tag_names.include?(tag.name) %>
+                <span href="#" class="tag-description" rel="tooltip" title="<%= tag.description %>"><%= tag.name %></span>
+              </label>
+          <% end %>
+        </div>
+      </div>
+
+      <div class='control-group'>
+        <%= label_tag :comment, 'Comment', :class => "control-label" %>
+        <div class="controls">
+          <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
+        </div>
+      </div>
+
+      <div class="form-actions">
+        <%= button_tag 'Update', :class => 'btn btn-primary' %>
+      </div>
+    </fieldset>
+<% end %>
+<%= javascript_tag do %>
+$(function() {
+  $(".tag-description").tooltip();
+});
+<% end %>

data/app/views/kaui/bundle_tags/edit.html.erb

@@ -1,37 +1,5 @@
-<div class="page-header">
+<div class='page-header'>
   <h1>Add/Remove Tags</h1>
 </div>
-<%= form_tag update_bundle_tags_path, :class => "form-horizontal" do %>
-  <%= hidden_field_tag :bundle_id, @bundle.bundle_id %>
-  <fieldset>
-    <div class="control-group">
-      <label class="control-label">Bundle name</label>
-      <div class="controls">
-        <label class="checkbox">
-          <%= link_to @bundle.external_key, Kaui.bundle_home_path.call(@bundle.bundle_id) %><br/>
-        </label>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= label_tag :name, "Tag", :class => "control-label" %>
-      <div class="controls">
-        <% @available_tags.each do |tag| %>
-          <label class="checkbox">
-            <%= check_box_tag "tags[]", tag.name, @tags.include?(tag.name) %>
-            <span href="#" class="tag-description" rel="tooltip" title="<%= tag.description %>"><%= tag.name %></span>
-          </label>
-        <% end %>
-      </div>
-    </div>
 
-    <div class="form-actions">
-      <%= button_tag "Update", :class =>"btn btn-primary" %>
-      <%= link_to 'Back', :back, :class => 'btn' %>
-    </div>
-  </fieldset>
-<% end %>
-<%= javascript_tag do %>
-  $(function() {
-    $(".tag-description").tooltip();
-  });
-<% end %>
+<%= render 'form' %>

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

@@ -0,0 +1,6 @@
+<%= render 'bundle_tags_table' %>
+
+<% if can? :add, Kaui::Tag or can? :remove, Kaui::Tag %>
+    <%= link_to 'Add/Remove Tags', kaui_engine.edit_bundle_tags_path(:bundle_id => @bundle.bundle_id), :class => 'btn' %>
+<% end %>
+<%= link_to 'Go to bundle', kaui_engine.bundle_path(:id => @bundle.bundle_id), :class => 'btn' %>

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

@@ -1,16 +1,16 @@
 <table id="bundles-table" class="table table-condensed">
   <thead>
-    <tr>
-      <th>Bundle ID</th>
-      <th>Account ID</th>
-      <th>External key</th>
-      <th>Subscriptions</th>
-    </tr>
+  <tr>
+    <th>Bundle ID</th>
+    <th>Account ID</th>
+    <th>External key</th>
+    <th>Subscriptions</th>
+  </tr>
   </thead>
   <tbody>
-    <tr>
-      <td colspan="1" class="dataTables_empty">Loading data from server</td>
-    </tr>
+  <tr>
+    <td colspan="1" class="dataTables_empty">Loading data from server</td>
+  </tr>
   </tbody>
 </table>
 

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

@@ -1,16 +1,18 @@
-<% if @bundle.present? %>
-  <dl class="dl-horizontal">
-    <dt>Id:</dt>
-    <dd><%= @bundle.bundle_id %>&nbsp;</dd>
-    <dt>Account:</dt>
-    <dd><%= @account.name %>&nbsp;</dd>
-    <dd><%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %>&nbsp;</dd>
-    <dt>Bundle key:</dt>
-    <dd><%= @bundle.external_key %>&nbsp;</dd>
-    <%= link_to "Transfer Ownership", kaui_engine.transfer_bundle_path(@bundle.bundle_id), :class => "btn btn-mini" %></dd>
-  <% if @subscriptions.present? %>
-    <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => { :subscriptions => @subscriptions, :account => @account } %>
+<dl class="dl-horizontal">
+  <dt>Id:</dt>
+  <dd><%= @bundle.bundle_id %>&nbsp;</dd>
+  <dt>Account:</dt>
+  <dd><%= @account.name %>&nbsp;</dd>
+  <dd><%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %>&nbsp;</dd>
+  <dt>Bundle key:</dt>
+  <dd>
+    <%= @bundle.external_key %>&nbsp;
+    <%= link_to 'Transfer Ownership', kaui_engine.transfer_bundle_path(@bundle.bundle_id), :class => 'btn btn-mini' %>
+  </dd>
+  <%= render :partial => 'kaui/tags/tags_table',
+             :locals  => {:tags => @tags, :tags_url_or_path => kaui_engine.edit_bundle_tags_path(:params => {:bundle_id => @bundle.bundle_id}), :tags_show_path => kaui_engine.bundle_tags_path(:bundle_id => @bundle.bundle_id)} %>
+  <% if @bundle.subscriptions.present? %>
+      <%= render :partial => 'kaui/subscriptions/subscriptions_table', :locals => {:subscriptions => @bundle.subscriptions, :account => @account} %>
   <% end %>
-<% else %>
-  <p>Bundle not found</p>
-<% end %>
+</dl>
+<%= link_to 'Go to account', kaui_engine.account_path(:id => @account.account_id), :class => 'btn' %>

data/app/views/kaui/bundles/transfer.html.erb

@@ -1,29 +1,30 @@
 <h3>Transfer <%= link_to Kaui.bundle_key_display_string.call(@bundle.external_key), Kaui.bundle_home_path.call(@bundle.bundle_id) if @bundle.external_key.present? %>&nbsp;</h3>
-<%= form_tag do_transfer_bundle_path(@bundle.bundle_id), :class => "form-horizontal", :method => :put do %>
-  <div class="control-group">
-    <%= label_tag :current_owner, 'Current account', :class => "control-label" %>
-    <div class="controls">
-      <label class="checkbox">
-        <%= link_to @account.name, Kaui.account_home_path.call(@account.external_key) %><br/>
-        <%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %><br/>
-        <%= link_to @account.external_key, Kaui.account_home_path.call(@account.external_key) %>
-      </label>
+<%= form_tag do_transfer_bundle_path(@bundle.bundle_id), :class => 'form-horizontal', :method => :put do %>
+    <div class="control-group">
+      <%= label_tag :current_owner, 'Current account', :class => 'control-label' %>
+      <div class="controls">
+        <label class="checkbox">
+          <%= link_to @account.name, Kaui.account_home_path.call(@account.external_key) %><br/>
+          <%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %><br/>
+          <%= link_to @account.external_key, Kaui.account_home_path.call(@account.external_key) %>
+        </label>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <label class="control-label" for="new_account_key">New Account</label>
-    <div class="controls">
-      <%= text_field_tag :new_account_key, nil, :class => "input-xlarge" %>
+    <div class="control-group">
+      <label class="control-label" for="new_account_key">New Account</label>
+
+      <div class="controls">
+        <%= text_field_tag :new_account_key, nil, :class => 'input-xlarge' %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= label_tag :comment, "Comment", :class => "control-label" %>
-    <div class="controls">
-      <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
+    <div class="control-group">
+      <%= label_tag :comment, 'Comment', :class => 'control-label' %>
+      <div class="controls">
+        <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
+      </div>
+    </div>
+    <div class="form-actions">
+      <%= submit_tag 'Change', :class => 'btn btn-primary' %>
+      <%= link_to 'Back', :back, :class => 'btn' %>
     </div>
-  </div>
-  <div class="form-actions">
-    <%= submit_tag "Change", :class => 'btn btn-primary' %>
-    <%= link_to 'Back', :back, :class => 'btn' %>
-  </div>
 <% end %>