From 49ee3a7a2eb25dc5144e154b4dfebfcc2477021c Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 18 Jul 2012 11:25:24 -0300
Subject: [PATCH] [licenses] Adding license in the content view page

---
 app/views/cms/_blog.rhtml                |  2 ++
 app/views/cms/_event.rhtml               |  1 +
 app/views/cms/_folder.rhtml              |  1 +
 app/views/cms/_forum.rhtml               |  2 ++
 app/views/cms/_gallery.rhtml             |  2 ++
 app/views/cms/_general_fields.html.erb   |  1 +
 app/views/cms/_published_article.rhtml   |  1 +
 app/views/cms/_raw_html_article.rhtml    |  1 +
 app/views/cms/_rss_feed.rhtml            |  2 ++
 app/views/cms/_textile_article.rhtml     |  1 +
 app/views/cms/_tiny_mce_article.rhtml    |  1 +
 app/views/content_viewer/view_page.rhtml | 22 ++++++++++++++++------
 public/stylesheets/application.css       | 12 ++++++++++++
 13 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 app/views/cms/_general_fields.html.erb

diff --git a/app/views/cms/_blog.rhtml b/app/views/cms/_blog.rhtml
index 7ee6054..3ee3f8a 100644
--- a/app/views/cms/_blog.rhtml
+++ b/app/views/cms/_blog.rhtml
@@ -6,6 +6,8 @@
 
 <%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
 
+<%= render :partial => 'general_fields' %>
+
 <script type="text/javascript">
   function submit_button(index) {
      return $("article_slug").form.select("input.submit")[index];
diff --git a/app/views/cms/_event.rhtml b/app/views/cms/_event.rhtml
index 7013a19..4b9bf5b 100644
--- a/app/views/cms/_event.rhtml
+++ b/app/views/cms/_event.rhtml
@@ -5,6 +5,7 @@
 
 <%= required f.text_field('name', :size => '64') %>
 
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 
 <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
diff --git a/app/views/cms/_folder.rhtml b/app/views/cms/_folder.rhtml
index 32331ef..b173914 100644
--- a/app/views/cms/_folder.rhtml
+++ b/app/views/cms/_folder.rhtml
@@ -1,5 +1,6 @@
 <%= required_fields_message %>
 
 <%= required f.text_field('name', :size => '64') %>
+<%= render :partial => 'general_fields' %>
 
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
diff --git a/app/views/cms/_forum.rhtml b/app/views/cms/_forum.rhtml
index e143ba1..c0c0829 100644
--- a/app/views/cms/_forum.rhtml
+++ b/app/views/cms/_forum.rhtml
@@ -6,6 +6,8 @@
 
 <%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
 
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
 
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
diff --git a/app/views/cms/_gallery.rhtml b/app/views/cms/_gallery.rhtml
index 32331ef..72689c2 100644
--- a/app/views/cms/_gallery.rhtml
+++ b/app/views/cms/_gallery.rhtml
@@ -2,4 +2,6 @@
 
 <%= required f.text_field('name', :size => '64') %>
 
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
diff --git a/app/views/cms/_general_fields.html.erb b/app/views/cms/_general_fields.html.erb
new file mode 100644
index 0000000..d1f7715
--- /dev/null
+++ b/app/views/cms/_general_fields.html.erb
@@ -0,0 +1 @@
+<%= labelled_form_field(_('License'), select(:article, :license_id, [[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]})) %>
diff --git a/app/views/cms/_published_article.rhtml b/app/views/cms/_published_article.rhtml
index 03e685d..e6a2622 100644
--- a/app/views/cms/_published_article.rhtml
+++ b/app/views/cms/_published_article.rhtml
@@ -1,3 +1,4 @@
 <%= f.text_field 'name', :size => '64' %>
+<%= render :partial => 'general_fields' %>
 
 <p><%= _('This is a republication of "%s", by %s.') % [link_to(h(@article.reference_article.name), @article.reference_article.url), @article.reference_article.profile.name] %></p>
diff --git a/app/views/cms/_raw_html_article.rhtml b/app/views/cms/_raw_html_article.rhtml
index 07d81f0..fbdff06 100644
--- a/app/views/cms/_raw_html_article.rhtml
+++ b/app/views/cms/_raw_html_article.rhtml
@@ -2,5 +2,6 @@
 
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
 
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
diff --git a/app/views/cms/_rss_feed.rhtml b/app/views/cms/_rss_feed.rhtml
index f99efaa..8b60ba6 100644
--- a/app/views/cms/_rss_feed.rhtml
+++ b/app/views/cms/_rss_feed.rhtml
@@ -2,6 +2,8 @@
 
 <%= required f.text_field(:name) %>
 
+<%= render :partial => 'general_fields' %>
+
 <%= required labelled_form_field(_('Limit of articles'), text_field(:article, :limit)) %>
 
 <%= labelled_form_field(_('Include in RSS Feed only posts from language:'), f.select(:language, [[_('All'),  nil ]] + Noosfero.locales.map { |k,v| [v, k]})) %>
diff --git a/app/views/cms/_textile_article.rhtml b/app/views/cms/_textile_article.rhtml
index 2c0c0a7..2299d27 100644
--- a/app/views/cms/_textile_article.rhtml
+++ b/app/views/cms/_textile_article.rhtml
@@ -4,5 +4,6 @@
 
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
 
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
diff --git a/app/views/cms/_tiny_mce_article.rhtml b/app/views/cms/_tiny_mce_article.rhtml
index 7a2d205..69dafbf 100644
--- a/app/views/cms/_tiny_mce_article.rhtml
+++ b/app/views/cms/_tiny_mce_article.rhtml
@@ -5,6 +5,7 @@
 <div>
   <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
 
+  <%= render :partial => 'general_fields' %>
   <%= render :partial => 'translatable' %>
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
 </div>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 7ba980a..ecfc5f2 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -12,6 +12,22 @@
   <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }), :complete => "$$('#article-toolbar .remote-lbOn').each(function(link) { new lightbox(link); }); jQuery('#article-toolbar .simplemenu-trigger').click(function(e) { e.stopPropagation(); })" %>
 </script>
 
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
 <% if !@page.tags.empty? %>
   <div id="article-tags">
     <%= _("This article's tags:") %>
@@ -19,12 +35,6 @@
   </div>
 <% end %>
 
-<% if @page.display_hits? %>
-  <div id="article-hits">
-    <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-  </div>
-<% end %>
-
 <% if @page.parent && !@page.parent.path.blank? %>
 <div id="article-parent">
   <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c03eb93..174bd48 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1019,14 +1019,26 @@ code input {
 #article-tags {
   font-size: 10px;
   text-align: right;
+  margin-bottom: -10px;
 }
 #article-tags a {
   text-decoration: none;
 }
 
+#article-sub-header {
+  height: 15px;
+}
+
 #article-hits {
   font-size: 10px;
+  float: left;
+}
+
+#article-license {
+  font-size: 10px;
+  float: right;
   text-align: right;
+  color: #AAA;
 }
 
 #article-cat {
--
libgit2 0.21.2