invoice_bar 0.0.3 → 0.0.4

data/app/controllers/invoice_bar/accounts_controller.rb

@@ -22,5 +22,11 @@ module InvoiceBar
     def destroy
       destroy! {}
     end
+    
+    protected
+    
+      def begin_of_association_chain
+        current_user
+      end
   end
 end

data/app/controllers/invoice_bar/contacts_controller.rb

@@ -32,6 +32,10 @@ module InvoiceBar
     end
   
     protected
+    
+      def begin_of_association_chain
+        current_user
+      end
   
       def collection
         @contacts ||= end_of_association_chain.page(params[:page])

data/app/controllers/invoice_bar/invoice_templates_controller.rb

@@ -93,6 +93,10 @@ module InvoiceBar
     end
   
     protected
+    
+      def begin_of_association_chain
+        current_user
+      end
   
       def collection
         @invoice_templates ||= end_of_association_chain.page(params[:page])

data/app/controllers/invoice_bar/invoices_controller.rb

@@ -186,6 +186,10 @@ module InvoiceBar
   
     protected
     
+      def begin_of_association_chain
+        current_user
+      end
+    
       def filter_params(bills)
         unless params[:from_amount].blank?
           params[:from_amount] = FormattedMoney.cents(params[:from_amount])

data/app/controllers/invoice_bar/receipt_templates_controller.rb

@@ -94,6 +94,10 @@ module InvoiceBar
   
     protected
   
+      def begin_of_association_chain
+        current_user
+      end
+        
       def collection
         @receipt_templates ||= end_of_association_chain.page(params[:page])
       end

data/app/controllers/invoice_bar/receipts_controller.rb

@@ -128,6 +128,10 @@ module InvoiceBar
   
     protected
     
+      def begin_of_association_chain
+        current_user
+      end
+    
       def filter_params(bills)
         @bills = bills.for_numbers(params[:number])
                       .within_dates(params[:from_date], params[:to_date])

data/app/views/invoice_bar/layouts/_navbar.html.erb

@@ -14,6 +14,7 @@
 						<li class="<%= active_for_controller('/invoice') %>"><%= link_to t('invoice_bar.navbar.invoices'), invoices_path %></li>
 						<li class="<%= active_for_controller('/receipt') %>"><%= link_to t('invoice_bar.navbar.receipts'), receipts_path %></li>
 						<li class="<%= active_for_controller('/contact') %>"><%= link_to t('invoice_bar.navbar.contacts'), contacts_path %></li>
+						<li class="<%= active_for_controller('/account') %>"><%= link_to t('invoice_bar.navbar.accounts'), accounts_path %></li>
 						<li class="<%= active_for_controller('/settings') %>"><%= link_to t('invoice_bar.navbar.profile'), profile_path %></li>
 						<% if current_user.administrator %>
 							<li class="<%= active_for_controller('/users') %>"><%= link_to t('invoice_bar.navbar.users'), users_path %></li>

data/app/views/invoice_bar/settings/index.html.erb

@@ -1,42 +1,37 @@
-<%= content_for :sub_navigation do %>	
+<div class="container">
 	<h1>Nastavení</h1>
-	<ul class="nav nav-pills" style="float:right;">
-		<li>
-	    <%= link_to 'Účty', accounts_path %>
-	  </li>
-	</ul>
-<% end %>
+	<div class="row">
+		<%= form_for @user do |f| %>
+		  <%= render 'invoice_bar/forms/errors', :model => @user %>
 
-<%= form_for @user do |f| %>
-  <%= render 'invoice_bar/forms/errors', :model => @user %>
-
-	<div class="span3">
-		<h4>Konto</h4>
-  	<div class="control-group">
-	    <%= f.label :email, t('attributes.user.email') %>
-	    <%= f.text_field :email, placeholder: t('attributes.user.email'), class: 'suggested' %>
-	  </div>
-	  <div class="control-group">
-	    <%= f.label :password, t('attributes.user.password') %>
-	    <%= f.text_field :password, placeholder: t('attributes.user.password'), class: 'suggested' %>
-	  </div>
-		<div class="control-group">
-	    <%= f.label :name, t('attributes.user.name') %>
-	    <%= f.text_field :name, placeholder: t('attributes.user.name'), class: 'suggested' %>
-	  </div>
-	  <div class="control-group">
-	    <%= f.label :ic, t('attributes.user.ic') %>
-	    <%= f.text_field :ic, placeholder: t('attributes.user.ic'), class: 'suggested' %>
-	  </div>
-	</div>
-  <div class="span3">
-	<h4>Adresa</h4>
-		<%= f.fields_for :address do |f|
-   			render 'invoice_bar/forms/address_fields', f: f
-		end -%>
+			<div class="span3">
+				<h4>Konto</h4>
+		  	<div class="control-group">
+			    <%= f.label :email, t('attributes.user.email') %>
+			    <%= f.text_field :email, placeholder: t('attributes.user.email'), class: 'suggested' %>
+			  </div>
+			  <div class="control-group">
+			    <%= f.label :password, t('attributes.user.password') %>
+			    <%= f.text_field :password, placeholder: t('attributes.user.password'), class: 'suggested' %>
+			  </div>
+				<div class="control-group">
+			    <%= f.label :name, t('attributes.user.name') %>
+			    <%= f.text_field :name, placeholder: t('attributes.user.name'), class: 'suggested' %>
+			  </div>
+			  <div class="control-group">
+			    <%= f.label :ic, t('attributes.user.ic') %>
+			    <%= f.text_field :ic, placeholder: t('attributes.user.ic'), class: 'suggested' %>
+			  </div>
+			</div>
+		  <div class="span3">
+			<h4>Adresa</h4>
+				<%= f.fields_for :address do |f|
+		   			render 'invoice_bar/forms/address_fields', f: f
+				end -%>
+			</div>
+			<div class="span10">
+			   <%= f.submit I18n.t('buttons.save'), :class => 'btn' %>
+			</div>
+		<% end %>
 	</div>
-	<div class="span10">
-	   <%= f.submit I18n.t('buttons.save'), :class => 'btn' %>
-	</div>
-<% end %>
-
+</div>

data/app/views/invoice_bar/users/new.html.erb

@@ -1 +1,5 @@
-<%= render 'form' %>
+<div class="container">
+	<div class="row">
+		<%= render 'form' %>
+	</div>
+</div>

data/lib/invoice_bar/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module InvoiceBar
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end