ActionItem21: checkpoint

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@981 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem21: checkpoint
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@981 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 84f38b95
Showing 5 changed files with 22 additions and 2 deletions Show diff stats
app/views/cms/text_html_new.rhtml
app/views/cms/view.rhtml
app/views/content_viewer/no_home_page.rhtml
public/stylesheets/button.css
public/stylesheets/common.css
@@ -11,5 +11,6 @@
   <%= f.text_area('body', :cols => 64) %>
   <%= design_display_button_submit('save', _('Save')) %>
+  <%= design_display_button('cancel', _('Cancel'), :action => 'view', :id => @article) %>
 <% end %>
@@ -48,6 +48,16 @@
   <% if @article %>
     <h2><%= @article.name %></h2>
     <% button_bar(:id => 'article-controls') do %>
+
+      <ul>
+        <li>
+        <%= _('"%{article}", last changed by %{author}') % { :article => @article.name, :author => 'bli' } %>
+        </li>
+        <li>
+        <%= _('Public address of this article: %s') % (@article.public_path) %>
+        </li>
+      </ul>
+
       <%= link_to_edit_article(@article) %>
       <%= button('home', _('Use as homepage'), { :action => 'set_home_page', :id => @article }, { :method => :post  }) %>
     <% end %>
@@ -0,0 +1,5 @@
+<h2><%= _("Missing home page") %></h2>
+
+<p>
+<%= _('%s did not choose an article for homepage yet.') % profile.name %>
+</p>
@@ -3,14 +3,14 @@
   margin-left: 5px;
   background-color: transparent;
   background-repeat: no-repeat;
-  background-position: 0px;
+  background-position: 0 0;
   padding-left: 25px;
   padding-right: 2px;
   float: left;
   display: block;
-  height: 26px;
+  height: 24px;
 }
@@ -201,6 +201,9 @@ div.file-manager-button a:hover {
   float: right;
   color: white;
 }
+#article-subitems-show.show-button {
+  float: right;
+}
 #article-subitems-hide.hide-button:hover {
   background-color: transparent;
   color: black;
@@ -220,4 +223,5 @@ div.file-manager-button a:hover {
   border: 1px solid gray;
   padding-top: 4px;
   padding-bottom: 4px;
+  margin-bottom: 1em;
 }
	@@ -11,5 +11,6 @@		@@ -11,5 +11,6 @@
11	<%= f.text_area('body', :cols => 64) %>	11	<%= f.text_area('body', :cols => 64) %>
12		12
13	<%= design_display_button_submit('save', _('Save')) %>	13	<%= design_display_button_submit('save', _('Save')) %>
		14	+ <%= design_display_button('cancel', _('Cancel'), :action => 'view', :id => @article) %>
14		15
15	<% end %>	16	<% end %>
	@@ -48,6 +48,16 @@		@@ -48,6 +48,16 @@
48	<% if @article %>	48	<% if @article %>
49	<h2><%= @article.name %></h2>	49	<h2><%= @article.name %></h2>
50	<% button_bar(:id => 'article-controls') do %>	50	<% button_bar(:id => 'article-controls') do %>
		51	+
		52	+ <ul>
		53	+ <li>
		54	+ <%= _('"%{article}", last changed by %{author}') % { :article => @article.name, :author => 'bli' } %>
		55	+ </li>
		56	+ <li>
		57	+ <%= _('Public address of this article: %s') % (@article.public_path) %>
		58	+ </li>
		59	+ </ul>
		60	+
51	<%= link_to_edit_article(@article) %>	61	<%= link_to_edit_article(@article) %>
52	<%= button('home', _('Use as homepage'), { :action => 'set_home_page', :id => @article }, { :method => :post }) %>	62	<%= button('home', _('Use as homepage'), { :action => 'set_home_page', :id => @article }, { :method => :post }) %>
53	<% end %>	63	<% end %>
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<h2><%= _("Missing home page") %></h2>
	2	+
	3	+<p>
	4	+<%= _('%s did not choose an article for homepage yet.') % profile.name %>
	5	+</p>
	@@ -3,14 +3,14 @@		@@ -3,14 +3,14 @@
3	margin-left: 5px;	3	margin-left: 5px;
4	background-color: transparent;	4	background-color: transparent;
5	background-repeat: no-repeat;	5	background-repeat: no-repeat;
6	- background-position: 0px;	6	+ background-position: 0 0;
7		7
8	padding-left: 25px;	8	padding-left: 25px;
9	padding-right: 2px;	9	padding-right: 2px;
10		10
11	float: left;	11	float: left;
12	display: block;	12	display: block;
13	- height: 26px;	13	+ height: 24px;
14		14
15	}	15	}
16		16