From 44487be7b50c4c58c7ad100afbefcd8536095b41 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Mon, 15 Mar 2010 14:20:52 -0300
Subject: [PATCH] Adding "unblock" button also in Disabled enterprise message

---
 app/views/content_viewer/view_page.rhtml    |  6 +-----
 app/views/profile/index.rhtml               |  6 +-----
 app/views/shared/_disabled_enterprise.rhtml | 10 ++++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 app/views/shared/_disabled_enterprise.rhtml

diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index ee16534..f607392 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -76,11 +76,7 @@
 </div>
 <% end %>
 
-<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
-  <div id='profile-disabled'>
-    <%= environment.message_for_disabled_enterprise %>
-  </div>
-<% end %>
+<%= render :partial => 'shared/disabled_enterprise' %>
 
 <% cache(@page.cache_key(params, user)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
diff --git a/app/views/profile/index.rhtml b/app/views/profile/index.rhtml
index 306a8cb..3afdf5f 100644
--- a/app/views/profile/index.rhtml
+++ b/app/views/profile/index.rhtml
@@ -1,8 +1,4 @@
-<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
-  <div id='profile-disabled'>
-    <%= environment.message_for_disabled_enterprise %>
-  </div>
-<% end %>
+<%= render :partial => 'shared/disabled_enterprise' %>
 
 <h1><%= profile.name %></h1>
 
diff --git a/app/views/shared/_disabled_enterprise.rhtml b/app/views/shared/_disabled_enterprise.rhtml
new file mode 100644
index 0000000..e246d31
--- /dev/null
+++ b/app/views/shared/_disabled_enterprise.rhtml
@@ -0,0 +1,10 @@
+<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
+  <div id='profile-disabled'>
+    <%= environment.message_for_disabled_enterprise %>
+    <% if profile.blocked? && user.is_admin?(profile.environment) %>
+      <div class='unlock-button'>
+        <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
--
libgit2 0.21.2