backlog 0.20.0 → 0.20.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.20.1 2008-01-29
+
+=== Fixes
+
+* Rearranged user edit view to avoid clutter.
+* Fixed sending of invitation mail for time sheets.
+  The sender and recipients were switched.
+
 == 0.20.0 2008-01-29
 
 === Features

data/app/controllers/user_controller.rb

@@ -178,9 +178,9 @@ class UserController < ApplicationController
     if already_monitoring
       flash[:notice] = "#{@subscriber.name} is already monitoring your work sheets."
     else
-      flash[:notice] = "Invitation sent to #{@subscriber.name}"
       monitoring_url = url_for :action => :toggle_work_lock_monitoring, :id => @user
-      UserNotify.deliver_monitoring_invitation(@user, @subscriber, monitoring_url)
+      UserNotify.deliver_monitoring_invitation(@subscriber, @user, monitoring_url)
+      flash[:notice] = "Invitation sent to #{@subscriber.name}"
     end
     render :template => '/display_notice', :layout => false
   end

data/app/views/user/edit.rhtml

@@ -9,30 +9,6 @@
     <h4><%=l :edit %></h4>
   </div>
 
-	<% if @user == current_user %>
-		<table align="right">
-			<% unless @user.work_lock_subscribers.empty? %>
-				<tr><th>Subscribers</th></tr>
-				<% for subscriber in @user.work_lock_subscribers %>
-					<tr>
-						<td align="right"><%=detour_to subscriber.name, :action => :edit%></td>
-						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
-					</tr>
-				<% end %>
-			<% end %>
-			<% unless @associates.empty? %>
-			<tr><td>
-				<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
-					<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%>
-				<td align="left"><%=submit_tag l(:invite)%></td>
-				<% end %>
-			</td></tr>
-			<% end %>
-		</table>
-	<% else %>
-		<% monitoring = @user.work_lock_subscribers.include? current_user %>
-		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
-	<% end %>
     <%= start_form_tag_helper %>
       <%= render_partial 'edit', :user => @user, :submit => true %>
     </form>
@@ -72,5 +48,34 @@
   </table>
 </div>
 
-<br clear="right"/>
+<br clear="left"/>
 
+<div id="lfeature">
+  <div class="btitle">
+    <h4><%=l :subscriptions %></h4>
+  </div>
+
+	<% if @user == current_user %>
+		<table align="right">
+			<% unless @user.work_lock_subscribers.empty? %>
+				<% for subscriber in @user.work_lock_subscribers %>
+					<tr>
+						<td align="right"><%=detour_to subscriber.name, :action => :edit%></td>
+						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
+					</tr>
+				<% end %>
+			<% end %>
+			<% unless @associates.empty? %>
+			<tr><td>
+				<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
+					<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%>
+				<td align="left"><%=submit_tag l(:invite)%></td>
+				<% end %>
+			</td></tr>
+			<% end %>
+		</table>
+	<% else %>
+		<% monitoring = @user.work_lock_subscribers.include? current_user %>
+		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
+	<% end %>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-28 00:00:00 +01:00
+date: 2008-01-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency