Merge branch 'stable' of gitlab.com:participa/noosfero into stable

Conflicts: Gemfile

Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Conflicts: Gemfile
Victor Costa
2 parents e76b5bbb 11166297
Showing 59 changed files with 1124 additions and 80 deletions Show diff stats
Gemfile
lib/feed_writer.rb
plugins/dspace/controllers/dspace_plugin_controller.rb
plugins/dspace/controllers/dspace_plugin_myprofile_controller.rb
plugins/dspace/lib/dspace/collection.rb
plugins/dspace/lib/dspace/community.rb
plugins/dspace/lib/dspace/item.rb
plugins/dspace/lib/dspace/resource.rb
plugins/dspace/lib/dspace_plugin.rb
plugins/dspace/lib/dspace_plugin/bitstream.rb
plugins/dspace/lib/dspace_plugin/collection.rb
plugins/dspace/lib/dspace_plugin/collection_helper.rb
plugins/dspace/lib/dspace_plugin/communityy.rb
plugins/dspace/lib/dspace_plugin/communityy_helper.rb
plugins/dspace/lib/dspace_plugin/item.rb
plugins/dspace/lib/dspace_plugin/item_helper.rb
plugins/dspace/lib/dspace_plugin/library.rb
plugins/dspace/lib/dspace_plugin/library_helper.rb
plugins/dspace/public/icons/audio.png
plugins/dspace/public/icons/document.png
@@ -15,7 +15,7 @@ gem &#39;thin&#39;,                     &#39;~&gt; 1.3.1&#39;
 gem 'hpricot',                  '~> 0.8.6'
 gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
-gem 'grape', '0.2.1'
+gem 'grape',					'~> 0.2.1'
 gem 'rest-client',              '~> 1.6.7'
 gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
@@ -19,7 +19,7 @@ class FeedWriter
         for article in articles
           xml.item do
             xml.title(article.name)
-            xml.description(article.to_html)
+            xml.description(article.to_html(:feed => true))
             if article.created_at
               # rfc822
               xml.pubDate(article.created_at.rfc2822)
@@ -0,0 +1,33 @@
+class DspacePluginController < PublicController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def view_item
+
+    collection_id = params[:collection_id]
+    item_id = params[:id]
+
+    begin
+      @collection = DspacePlugin::Collection.find(collection_id)
+    rescue ActiveRecord::RecordNotFound
+      render_not_found
+      return
+    end
+
+    begin
+      dspace_server = @collection.parent.parent.dspace_server_url
+      @item = Dspace::Item.get_item_by_id dspace_server, item_id
+      rescue ActiveResource::UnauthorizedAccess
+      render_not_found
+      return
+    end
+
+    begin
+      @collection = DspacePlugin::Collection.find(collection_id)
+    rescue ActiveRecord::RecordNotFound
+      render_not_found
+      return
+    end
+
+  end
+
+end
@@ -0,0 +1,72 @@
+class DspacePluginMyprofileController < CmsController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def new
+
+    @success_back_to = params[:success_back_to]
+
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
+    record_coming
+    @type = params[:type]
+    if @type.blank?
+      @article_types = []
+      available_article_types.each do |type|
+        @article_types.push({
+          :class => type,
+          :short_description => type.short_description,
+          :description => type.description
+        })
+      end
+      @parent_id = params[:parent_id]
+      render :action => 'select_article_type', :layout => false, :back_to => @back_to
+      return
+    else
+      refuse_blocks
+    end
+
+    raise "Invalid article type #{@type}" unless valid_article_type?(@type)
+
+    klass = @type.constantize
+    article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {}
+    article_data.merge!(params[:article]) if params[:article]
+
+    if @type == 'DspacePlugin::Collection'
+      dspace_objects = article_data['dspace_collections']
+    elsif @type == 'DspacePlugin::Communityy'
+      dspace_objects = article_data['dspace_communities']
+    end
+
+    dspace_objects.each do |object|
+
+      entity = klass.new
+
+      parent = check_parent(params[:parent_id])
+
+      if parent
+        entity.parent = parent
+        parent_id = parent.id
+      end
+
+      if @type == 'DspacePlugin::Communityy'
+        entity.dspace_community_id = object['id']
+      elsif @type == 'DspacePlugin::Collection'
+        entity.dspace_community_id = article_data['dspace_community_id']
+        entity.dspace_collection_id = object['id']
+        entity.accept_comments = false
+      end
+
+      entity.name = object['name']
+      entity.profile = profile
+      entity.author = user
+      entity.last_changed_by = user
+      entity.created_by = user
+
+      entity.save!
+
+    end
+
+    redirect_to @parent.view_url
+
+  end
+
+end
@@ -0,0 +1,24 @@
+class Dspace::Collection < Dspace::Resource
+
+  def self.get_all_items_from(dspace_server, collection_id)
+    self.site = dspace_server
+    result = self.find collection_id, :params => { :expand => 'items' }
+
+    item_list = []
+
+    if result.items.count > 0
+      result.items.each { |element|
+        item = Dspace::Item.get_item_by_id dspace_server, element.id
+        item_list << item
+      }
+    end
+
+    item_list
+  end
+
+  def self.get_all_collections_from(dspace_server)
+    self.site = dspace_server
+    self.find(:all)
+  end
+
+end
@@ -0,0 +1,14 @@
+class Dspace::Community < Dspace::Resource
+
+  def self.get_all_communities_from(dspace_server)
+    self.site = dspace_server
+    self.find(:all)
+  end
+
+  def self.get_all_collections_from(dspace_server, community_id)
+    self.site = dspace_server
+    result = self.find community_id, :params => { :expand => 'collections' }
+    result.collections
+  end
+
+end
@@ -0,0 +1,89 @@
+class Dspace::Item < Dspace::Resource
+
+  def self.get_all_item_metadata_from(dspace_server, item_id)
+    self.site = dspace_server
+    result = self.find item_id, :params => { :expand => 'metadata' }
+    result.metadata
+  end
+
+  def self.get_item_by_id(dspace_server, item_id)
+    self.site = dspace_server
+    result = self.find item_id, :params => { :expand => 'metadata' }
+
+    item_metadata = Dspace::Item.get_all_item_metadata_from self.site, result.id
+
+    # author
+    metadata = item_metadata[0].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      author =  metadata.has_key?('dc.contributor.author') ? metadata['dc.contributor.author'] : nil
+    end
+
+    # issue date
+    metadata = item_metadata[3].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      issue_date = metadata.has_key?('dc.date.issued') ? metadata['dc.date.issued'] : nil
+    end
+
+    # uri
+    metadata = item_metadata[4].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      uri = metadata.has_key?('dc.identifier.uri') ? metadata['dc.identifier.uri'] : nil
+    end
+
+    # description
+    metadata = item_metadata[5].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      abstract = metadata.has_key?('dc.description') ? metadata['dc.description'] : nil
+    end
+
+    # abstract
+    metadata = item_metadata[6].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      description = metadata.has_key?('dc.description.abstract') ? metadata['dc.description.abstract'] : nil
+    end
+
+    item = DspacePlugin::Item.new
+
+    item.id = result.id
+    item.name = result.name
+    item.author = author
+    item.issue_date = issue_date
+    item.abstract = abstract
+    item.description = description
+    item.uri = uri
+
+    ### BITSTREAMS
+
+    item_bitstreams = self.find item_id, :params => { :expand => 'bitstreams' }
+
+    bitstreams = item_bitstreams.bitstreams
+
+    bitstreams.each do |bs|
+      bitstream = DspacePlugin::Bitstream.new
+      bitstream.id = bs.attributes[:id]
+      bitstream.name = bs.attributes[:name]
+      bitstream.description = bs.attributes[:description]
+      bitstream.mimetype = bs.attributes[:mimeType]
+      bitstream.size_bytes = bs.attributes[:sizeBytes]
+      bitstream.retrieve_link = bs.attributes[:retrieveLink]
+      bitstream.format = bs.attributes[:format]
+      bitstream.link = bs.attributes[:link]
+
+      item.files << bitstream
+
+    end
+
+    if item.files.count > 0
+      item.mimetype = item.files.first.mimetype
+    end
+
+    item
+
+  end
+
+end
@@ -0,0 +1,15 @@
+class Dspace::Resource < ActiveResource::Base
+
+  class << self
+    def element_path(id, prefix_options = {}, query_options = nil)
+      prefix_options, query_options = split_options(prefix_options) if query_options.nil?
+      "#{prefix(prefix_options)}#{collection_name}/#{id}#{query_string(query_options)}"
+    end
+
+    def collection_path(prefix_options = {}, query_options = nil)
+      prefix_options, query_options = split_options(prefix_options) if query_options.nil?
+      "#{prefix(prefix_options)}#{collection_name}#{query_string(query_options)}"
+    end
+  end
+
+end
@@ -0,0 +1,36 @@
+class DspacePlugin < Noosfero::Plugin
+
+  def self.plugin_name
+      "DSpace Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that add a DSpace library feature to noosfero.")
+  end
+
+  def content_types
+    if context.respond_to?(:params) && context.params
+      types = []
+      parent_id = context.params[:parent_id]
+      types << DspacePlugin::Library if context.profile.community? && !parent_id
+      parent = parent_id ? context.profile.articles.find(parent_id) : nil
+      if parent.kind_of?(DspacePlugin::Library)
+        types << DspacePlugin::Communityy
+      elsif parent.kind_of?(DspacePlugin::Communityy)
+        types << DspacePlugin::Collection
+      end
+      types
+    else
+      [DspacePlugin::Library, DspacePlugin::Collection, DspacePlugin::Communityy]
+    end
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+end
@@ -0,0 +1,5 @@
+class DspacePlugin::Bitstream
+
+  attr_accessor :id, :name, :description, :mimetype, :size_bytes, :retrieve_link, :format, :link
+
+end
@@ -0,0 +1,31 @@
+class DspacePlugin::Collection < Article
+
+  settings_items :dspace_collection_id, :type => :string
+  settings_items :dspace_community_id, :type => :integer
+
+  attr_accessible :dspace_collection_id, :dspace_community_id
+
+  def self.icon_name(article = nil)
+    'dspace-collection'
+  end
+
+  def self.short_description
+    _("DSpace collection")
+  end
+
+  def self.description
+    _("Defines a DSpace collection")
+  end
+
+  def to_html(options = {})
+    dspace_content = self
+    proc do
+      render :file => 'content_viewer/dspace_content', :locals => { :dspace_content => dspace_content }
+    end
+  end
+
+  def items(dspace_server, collection_id)
+    Dspace::Collection.get_all_items_from dspace_server, collection_id
+  end
+
+end
@@ -0,0 +1,14 @@
+module DspacePlugin::CollectionHelper
+
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
+    @article = article
+
+    visibility_options(article,tokenized_children) +
+    content_tag('div',
+      hidden_field_tag('article[accept_comments]', 0)
+    )
+  end
+
+end
@@ -0,0 +1,30 @@
+class DspacePlugin::Communityy < Folder
+
+  settings_items :dspace_community_id, :type => :string
+
+  attr_accessible :dspace_community_id
+
+  def self.icon_name(article = nil)
+    'dspace-community'
+  end
+
+  def self.short_description
+    _("DSpace community")
+  end
+
+  def self.description
+    _("Defines a DSpace community")
+  end
+
+  def to_html(options = {})
+    dspace_content = self
+    proc do
+      render :file => 'content_viewer/dspace_content', :locals => { :dspace_content => dspace_content }
+    end
+  end
+
+  def collections(dspace_server, community_id)
+    DspacePlugin::Collection.find(:all)
+  end
+
+end
@@ -0,0 +1,14 @@
+module DspacePlugin::CommunityyHelper
+
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
+    @article = article
+
+    visibility_options(article,tokenized_children) +
+    content_tag('div',
+      hidden_field_tag('article[accept_comments]', 0)
+    )
+  end
+
+end
@@ -0,0 +1,11 @@
+class DspacePlugin::Item
+
+  include DspacePlugin::ItemHelper
+
+  attr_accessor :id, :name, :author, :issue_date, :abstract, :description, :uri, :files, :mimetype
+
+  def initialize
+    self.files = []
+  end
+
+end
@@ -0,0 +1,90 @@
+module DspacePlugin::ItemHelper
+
+  TEXT_MIMETYPES = [ 'text/plain; charset=utf-8',
+                     'text/html',
+                     'text/xml',
+                     'text/plain',
+                     'text/html',
+                     'text/css',
+                     'text/richtext' ]
+
+  AUDIO_MIMETYPES = [ 'audio/x-pn-realaudio',
+                      'audio/x-mpeg',
+                      'audio/x-aiff',
+                      'audio/basic',
+                      'audio/x-wav' ]
+
+  DOCUMENT_MIMETYPES = [ 'application/msword',
+                         'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                         'application/vnd.oasis.opendocument.text',
+                         'application/vnd.oasis.opendocument.text-template',
+                         'application/vnd.oasis.opendocument.text-web',
+                         'application/vnd.oasis.opendocument.text-master',
+                         'application/vnd.sun.xml.writer',
+                         'application/vnd.sun.xml.writer.template',
+                         'application/vnd.sun.xml.writer.global',
+                         'application/vnd.stardivision.writer',
+                         'application/vnd.stardivision.writer-global' ]
+
+  PICTURE_MIMETYPES = [  'image/x-photo-cd',
+                         'image/x-ms-bmp',
+                         'image/jpeg',
+                         'image/gif',
+                         'image/png',
+                         'image/tiff',
+                         'application/x-photoshop',
+                         'application/postscript' ]
+
+  SPREADSHEET_MIMETYPES = [ 'application/vnd.ms-excel',
+                            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                            'application/vnd.oasis.opendocument.spreadsheet',
+                            'application/vnd.oasis.opendocument.spreadsheet-template',
+                            'application/vnd.sun.xml.calc',
+                            'application/vnd.sun.xml.calc.template',
+                            'application/vnd.sun.xml.math',
+                            'application/vnd.stardivision.calc' ]
+
+  VIDEO_MIMETYPES = [ 'video/quicktime',
+                      'video/mpeg' ]
+
+
+  def remove_slash_at_end_url(url)
+    url.gsub!(/\/$/,'') if url =~ /\/$/
+    url
+  end
+
+  def class_for_item_mimetype(mimetype)
+
+    case
+
+      when mimetype == 'application/pdf'
+        mimetype_class = 'pdf'
+
+      when TEXT_MIMETYPES.include?(mimetype)
+        mimetype_class = 'text'
+
+      when AUDIO_MIMETYPES.include?(mimetype)
+        mimetype_class = 'audio'
+
+      when DOCUMENT_MIMETYPES.include?(mimetype)
+        mimetype_class = 'document'
+
+      when PICTURE_MIMETYPES.include?(mimetype)
+        mimetype_class = 'picture'
+
+      when SPREADSHEET_MIMETYPES.include?(mimetype)
+        mimetype_class = 'spreadsheet'
+
+      when VIDEO_MIMETYPES.include?(mimetype)
+        mimetype_class = 'video'
+
+      else
+        mimetype_class = 'other'
+
+    end
+
+    "icon-#{mimetype_class}"
+
+  end
+
+end
@@ -0,0 +1,49 @@
+class DspacePlugin::Library < Folder
+
+  settings_items :dspace_server_url, :type => :string
+
+  attr_accessible :dspace_server_url
+
+  def dspace_server_url_valid
+
+    if self.dspace_server_url.blank?
+      errors.add(:dspace_server_url, _("can't be blank") )
+      return
+    end
+
+    errors.add(self.dspace_server_url, _("is not a valid URL. Please correct it and resubmit.")) unless url_valid?(self.dspace_server_url)
+  end
+
+  validate :dspace_server_url_valid
+
+  def self.icon_name(article = nil)
+    'dspace-library'
+  end
+
+  def self.short_description
+    _("DSpace library")
+  end
+
+  def self.description
+    _("Defines a DSpace library")
+  end
+
+  def to_html(options = {})
+    dspace_content = self
+    proc do
+      render :file => 'content_viewer/dspace_content', :locals => { :dspace_content => dspace_content }
+    end
+  end
+
+  def communities
+    DspacePlugin::Communityy.find(:all)
+  end
+
+  protected
+
+  def url_valid?(url)
+    url = URI.parse(url) rescue false
+    url.kind_of?(URI::HTTP) || url.kind_of?(URI::HTTPS)
+  end
+
+end
@@ -0,0 +1,14 @@
+module DspacePlugin::LibraryHelper
+
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
+    @article = article
+
+    visibility_options(article,tokenized_children) +
+    content_tag('div',
+      hidden_field_tag('article[accept_comments]', 0)
+    )
+  end
+
+end
@@ -0,0 +1,85 @@
+/**
+
+function selectCommunity(element, community_slug) {
+  var hidden_field = jQuery('<input>').attr({
+      id: 'article_dspace_community_name_',
+      name: 'article[dspace_communities_names][]',
+      type: 'hidden',
+      name: 'article[dspace_communities_names][]',
+      value: community_slug
+  });
+  jQuery(hidden_field).insertAfter(element);
+}
+
+
+function selectCollection(element, collection_slug) {
+  var hidden_field = jQuery('<input>').attr({
+      id: 'article_dspace_collection_name_',
+      name: 'article[dspace_collections_names][]',
+      type: 'hidden',
+      name: 'article[dspace_collections_names][]',
+      value: collection_slug
+  });
+  jQuery(hidden_field).insertAfter(element);
+}
+
+function select_action(field_active) {
+}
+**/
+
+jQuery(document).ready(function() {
+  url_base = window.location.protocol + '//' + window.location.host;
+  forms = jQuery('form');
+  forms.each( function(f) {
+    url_action = forms[f].action;
+    if (url_action.indexOf("/cms/new") > -1) {
+      forms[f].action = url_action.replace("/cms/new", "/plugin/dspace/new").replace(url_base,'');
+    }
+  });
+
+  function check_fields(check, table_id) {
+    var checkboxes = jQuery("#" + table_id + " tbody tr td input[type='checkbox']")
+    for (var i = 0; i < checkboxes.length; i++) {
+      if (checkboxes[i].disabled == false) {
+        checkboxes[i].checked = check
+      }
+    }
+  }
+
+  function verify_checked(field_id){
+    var checkboxes = jQuery("#" + field_id + "_fields_conf tbody tr td input[type='checkbox']")
+    var allchecked = true;
+    for (var j = 1; j < checkboxes.length; j++) {
+      if(!checkboxes[j].checked) {
+        allchecked = false;
+        break;
+      }
+    }
+
+    var checkbox = jQuery("#" + field_id + "_active");
+    checkbox.attr("checked", allchecked);
+  }
+
+
+  function check_all(field_id) {
+    jQuery("#" + field_id + "_active").click(function (){
+      check_fields(this.checked, field_id + "_fields_conf")
+    });
+    verify_checked(field_id);
+  }
+
+  check_all("community");
+  check_all("collection");
+
+  jQuery("input[type='checkbox']").click(function () {
+    var checkbox = jQuery(this).attr("id").split("_");
+    verify_checked(checkbox.first());
+
+    if(this.checked == false) {
+      jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", false)
+    }
+
+    jQuery(this).next().attr("disabled", !this.checked);
+  })
+
+});
@@ -0,0 +1,101 @@
+#dspace_library ul {
+  margin: 0;
+  padding: 0 0 0 5px;
+}
+
+#dspace_library li {
+  /**list-style-image: url(/designs/themes/base/imgs/li-recent.gif);*/
+  list-style-type: none;
+}
+
+#dspace_library li.item,
+#dspace_library li.collection,
+#dspace_library li.community {
+  margin: 0;
+  padding: 10px 0;
+}
+
+#dspace_library li.item span.name,
+#dspace_library li.collection span.title,
+#dspace_library li.community span.title {
+  font-weight: bold;
+}
+
+#dspace_library div#actions {
+  margin: 10px 0;
+}
+
+#dspace_library_item {
+  /*8border: 1px solid green;*/
+}
+
+.dspace_item_section {
+  margin: 15px;
+}
+
+.dspace_item_section_title {
+  margin: 0px;
+  font-weight: bold;
+  border-bottom: 1px solid #c0c0c0;
+}
+
+#dspace_library_item ul {
+  list-style-type: none;
+}
+
+#dspace_library_item ul#item_files_list,
+#dspace_library_item ul.item_file_attributes_list {
+  margin: 0;
+  padding: 0;
+}
+
+#dspace_library_item ul#item_files_list > li {
+  margin: 5px 0;
+}
+
+.icon-newdspace-library,
+.icon-dspace-library,
+.icon-newdspace-community,
+.icon-dspace-community,
+.icon-newdspace-collection,
+.icon-dspace-collection {
+  background-image: url(/plugins/dspace/icons/dspace.png)
+}
+
+#dspace_library div.icon-item {
+  width: 32px;
+  height: 33px;
+  display: inline-block;
+  vertical-align: top;
+  border-right: 1px solid #c0c0c0;
+}
+
+#dspace_library div.icon-audio {
+  background-image: url(/plugins/dspace/icons/audio.png)
+}
+
+#dspace_library div.icon-document {
+  background-image: url(/plugins/dspace/icons/document.png)
+}
+
+#dspace_library div.icon-pdf {
+  background-image: url(/plugins/dspace/icons/pdf.png)
+}
+
+#dspace_library div.icon-picture {
+  background-image: url(/plugins/dspace/icons/picture.png)
+}
+
+#dspace_library div.icon-spreadsheet {
+  background-image: url(/plugins/dspace/icons/spreadsheet.png)
+}
+
+#dspace_library div.icon-text,
+#dspace_library div.icon-other {
+  background-image: url(/plugins/dspace/icons/text.png)
+}
+
+#dspace_library div.icon-video {
+  background-image: url(/plugins/dspace/icons/video.png)
+}
+
@@ -0,0 +1,50 @@
+<h1><%= _('DSpace Collections') %></h1>
+
+<%= hidden_field_tag 'article[parent_id]', @article.parent_id %>
+
+<%= hidden_field_tag 'article[dspace_community_id]', @article.parent.dspace_community_id %>
+
+<% dspace_server_url = @article.parent.parent.dspace_server_url %>
+
+<% community_id = @article.parent.dspace_community_id %>
+
+<% collections = Dspace::Community.get_all_collections_from( dspace_server_url, community_id ).map { |collection| item = [_(collection.name), collection.id] } %>
+
+<table id="collection_fields_conf" border="0" style="border-bottom: 1px solid #c0c0c0;">
+  <tr style="background-color: #f0f0f0; border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;">
+    <td style="font-style: italic">
+      <%= _("Check/Uncheck All Unlocked")%>
+    </td>
+    <td align="center">
+      <input type="checkbox" id="collection_active" />
+    </td>
+  </tr>
+
+  <% dspace_collections_ids = DspacePlugin::Collection.find(:all, :conditions => { :parent_id => @article.parent_id}).map { |collection| ids = collection.dspace_collection_id.to_i } %>
+
+  <% collections.each do |collection| %>
+
+  <tr>
+    <td>
+      <%= collection[0] %>
+    </td>
+
+    <% if dspace_collections_ids.include? collection[1] %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_collections][][id]", collection[1], true, :disabled => 'disabled', :id => "collection_id_#{collection[1]}" %>
+      <%= hidden_field_tag "article[dspace_collections][][name]", collection[0], :disabled => 'disabled' %>
+    </td>
+    <% else %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_collections][][id]", collection[1], false, :id => "collection_id_#{collection[1]}" %>
+     <%= hidden_field_tag "article[dspace_collections][][name]", collection[0], :disabled => 'disabled', :id => "collection_name_#{collection[1]}" %>
+    </td>
+    <% end %>
+
+  </tr>
+
+  <% end %>
+
+</table>
+
+<%= javascript_include_tag 'plugins/dspace/javascripts/dspace_plugin' %>
@@ -0,0 +1,46 @@
+<h1><%= _('DSpace Communities') %></h1>
+
+<%= hidden_field_tag 'article[parent_id]', @article.parent_id %>
+
+<% dspace_server_url = @article.parent.dspace_server_url %>
+
+<% communities = Dspace::Community.get_all_communities_from(dspace_server_url).map { |community| item = [_(community.name), community.id] } %>
+
+<table id="community_fields_conf" border="0" style="border-bottom: 1px solid #c0c0c0;">
+  <tr style="background-color: #f0f0f0; border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;">
+    <td style="font-style: italic">
+      <%= _("Check/Uncheck All Unlocked")%>
+    </td>
+    <td align="center">
+      <input type="checkbox" id="community_active" />
+    </td>
+  </tr>
+
+  <% dspace_communities_ids = DspacePlugin::Communityy.find(:all, :conditions => { :parent_id => @article.parent_id }).map { |community| ids = community.dspace_community_id.to_i } %>
+
+  <% communities.each do |community| %>
+
+  <tr>
+    <td>
+      <%= community[0] %>
+    </td>
+
+    <% if dspace_communities_ids.include? community[1] %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_communities][][id]", community[1], true, :disabled => 'disabled', :id => "community_id_#{community[1]}" %>
+      <%= hidden_field_tag "article[dspace_communities][][name]", community[0], :disabled => 'disabled' %>
+    </td>
+    <% else %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_communities][][id]", community[1], false, :id => "community_id_#{community[1]}" %>
+      <%= hidden_field_tag "article[dspace_communities][][name]", community[0], :disabled => 'disabled', :id => "community_name_#{community[1]}" %>
+    </td>
+    <% end %>
+
+  </tr>
+
+  <% end %>
+
+</table>
+
+<%= javascript_include_tag 'plugins/dspace/javascripts/dspace_plugin' %>
@@ -0,0 +1,11 @@
+<h1><%= _('My DSpace Library') %></h1>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
+
+<%= required f.text_field(:dspace_server_url, :size => '150', :maxlength => 150) %>
+
+<%= render :partial => 'general_fields' %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 68, :rows => 10)) %>
@@ -0,0 +1,3 @@
+<li class="collection">
+  <span class="title"><%= link_to collection.name, :controller => 'content_viewer', :action => 'view_page', :page => collection.path %></span>
+</li>
@@ -0,0 +1,3 @@
+<li class="community">
+  <span class="title"><%= link_to community.title, :controller => 'content_viewer', :action => 'view_page', :page => community.path %></span>
+</li>
@@ -0,0 +1,9 @@
+<li class="item">
+  <div style="vertical-align: top;">
+    <div class="icon-item <%= item.class_for_item_mimetype(item.mimetype) %>"></div>
+    <div style="display: inline-block; width: 92%;">
+      <span class="name"><%= link_to item.name, :controller => 'dspace_plugin', :action => 'view_item', :id => item.id, :collection_id => @page.id %></span><br />
+      <span class="authors"><%= item.author %></span> <span class="date_issued">(<%= item.issue_date %>)</span>
+    </div>
+  </div>
+</li>
@@ -0,0 +1,59 @@
+<div id="dspace_library">
+
+  <% if dspace_content.allow_create?(user) %>
+
+  <div id="actions">
+
+    <% if dspace_content.is_a? DspacePlugin::Library %>
+
+      <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "DspacePlugin::Communityy", :parent_id => dspace_content.id}), :class => 'button with-text icon-add') do %>
+        <%= _("Add %s") % DspacePlugin::Communityy.short_description %>
+      <% end %>
+
+    <% elsif dspace_content.is_a? DspacePlugin::Communityy %>
+
+      <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "DspacePlugin::Collection", :parent_id => dspace_content.id}), :class => 'button with-text icon-add') do %>
+        <%= _("Add %s") % DspacePlugin::Collection.short_description %>
+      <% end %>
+
+    <% end %>
+
+  </div>
+
+  <% end %>
+
+  <% if dspace_content.is_a? DspacePlugin::Library %>
+
+    <% communities = dspace_content.communities %>
+
+  <ul id="communities_list">
+    <%= render :partial => 'community', :collection => communities %>
+  </ul>
+
+  <% elsif dspace_content.is_a? DspacePlugin::Communityy %>
+
+    <% community_id = dspace_content.dspace_community_id %>
+    <% dspace_server = dspace_content.parent.dspace_server_url %>
+
+    <% collections = dspace_content.collections dspace_server, community_id %>
+
+  <ul id="collections_list">
+    <%= render :partial => 'collection', :collection => collections %>
+  </ul>
+
+  <% elsif dspace_content.is_a? DspacePlugin::Collection %>
+
+    <% collection_id = dspace_content.dspace_collection_id %>
+    <% dspace_server = dspace_content.parent.parent.dspace_server_url %>
+
+    <div id="dspace_library">
+      <div id="dspace_collection">
+        <ul id="items_list">
+          <%= render :partial => 'item', :collection => dspace_content.items(dspace_server, collection_id) %>
+        </ul>
+      </div>
+    </div>
+
+  <% end %>
+
+</div>
@@ -0,0 +1,12 @@
+<li>
+  <ul class="item_file_attributes_list">
+    <li>
+      <span><%= _('File:') %></span> <%= link_to item_file.name, dspace_server_url + item_file.retrieve_link, :target => '_blank' %></li>
+    <% unless item_file.description.blank? %>
+    <li>
+      <span><%= _('Description:') %> </span> <%= item_file.description %></li>
+    <% end %>
+    <li>
+      <span><%= _('Size:') %> </span> <%= number_to_human_size( item_file.size_bytes ) %></li>
+  </ul>
+</li>
@@ -0,0 +1,8 @@
+<div class="dspace_item_section">
+  <div class="dspace_item_section_title">
+   <%= item_section[:title] %>
+  </div>
+  <div class="dspace_item_section_content">
+    <%= item_section[:content] %>
+  </div>
+</div>
@@ -0,0 +1,28 @@
+<% extend DspacePlugin::ItemHelper %>
+
+<div id="article-parent">
+  <%= button(:back, _('Go back to %s') % @collection.short_title, @collection.url) %>
+</div>
+
+<div id="dspace_library_item">
+
+  <div id="dspace_item_title">
+    <h1 class="title"><%= @item.name %></h1>
+  </div>
+
+  <% item_files = render :partial => 'item_file',
+               :locals => { :dspace_server_url => remove_slash_at_end_url(@collection.parent.parent.dspace_server_url) },
+               :collection => @item.files %>
+
+  <% item_files_content = content_tag('ul', item_files, :id => 'item_files_list') %>
+
+
+  <%= render :partial => 'item_section',
+             :collection => [ { :title => _('Authors:'), :content => @item.author },
+                              { :title => _('Issue date:'), :content => @item.issue_date },
+                              { :title => _('Abstract:'), :content => @item.abstract },
+                              { :title => _('Description:'), :content => @item.description },
+                              { :title => _('URI:'), :content => link_to(@item.uri, @item.uri, :target => '_blank') },
+                              { :title => _('Files in this item'), :content => item_files_content } ] %>
+
+</div>
@@ -20,6 +20,12 @@ class ProposalsDiscussionPluginPublicController &lt; ApplicationController
     case order
     when 'alphabetical'
       proposals.reorder('name')
+    when 'recent'
+      proposals.reorder('created_at DESC')
+    when 'most_commented'
+      proposals.reorder('comments_count DESC')
+    when 'most_recently_commented'
+      proposals.joins("LEFT OUTER JOIN comments ON comments.source_id=articles.id AND comments.created_at >= '#{5.days.ago}'").group('articles.id').reorder('count(comments.id) DESC')
     else
       set_seed
       proposals.reorder('random()')
 class ProposalsDiscussionPlugin::Discussion < Folder
+  acts_as_having_posts
+
   has_many :topics, :class_name => 'ProposalsDiscussionPlugin::Topic', :foreign_key => 'parent_id'
   has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
@@ -26,4 +28,9 @@ class ProposalsDiscussionPlugin::Discussion &lt; Folder
   end
   alias_method_chain :cache_key, :person
+  def posts
+    #override posts method to list proposals in feed
+    ProposalsDiscussionPlugin::Proposal.from_discussion(self)
+  end
+
 end
 class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
   scope :private, lambda {|user| {:conditions => {:last_changed_by_id => user.id, :published => false}}}
+  scope :from_discussion, lambda {|discussion| joins(:parent).where(['parents_articles.parent_id = ?', discussion.id])}
   alias :topic :parent
@@ -16,8 +17,12 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
   def to_html(options = {})
-    proc do
-      render :file => 'content_viewer/proposal'
+    unless options[:feed]
+      proc do
+        render :file => 'content_viewer/proposal'
+      end
+    else
+      body
     end
   end
@@ -38,4 +43,8 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
   end
   alias_method_chain :cache_key, :person
+  def can_display_versions?
+    false
+  end
+
 end
@@ -1,8 +0,0 @@
-module ProposalsDiscussionPlugin::ProposalHelper
-
-  def visibility_options(article, tokenized_children)
-    article.published = false if article.new_record?
-    super
-  end
-
-end
 module ProposalsDiscussionPlugin::ProposalsListHelper
+  def sort_criteria
+    [[_('Random'), :random], [_('Alphabetical'), :alphabetical], [_('Recent'), :recent], [_('Most Commented'), :most_commented], [_('Most Recently Commented'), :most_recently_commented]]
+  end
+
   def more_proposals(text, holder, order, page=1)
     link_to text, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order, :page => page })
   end
@@ -44,11 +44,21 @@ class ProposalsDiscussionPlugin::Topic &lt; Folder
   end
   def proposals_per_day
-    proposals.group("date(created_at)").count
+    result = proposals.group("date(created_at)").count
+    fill_empty_days(result)
   end
   def comments_per_day
-    proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
+    result = proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
+    fill_empty_days(result)
+  end
+
+  def fill_empty_days(result)
+    from = created_at.to_date
+    (from..Date.today).inject({}) do |h, date|
+      h[date.to_s] = result[date.to_s] || 0
+      h
+    end
   end
   def cache_key_with_person(params = {}, user = nil, language = 'en')
@@ -0,0 +1,12 @@
+module ProposalsDiscussionPlugin::TopicHelper
+
+  def topic_title(topic)
+    image_icon = topic.image ?  image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''
+
+    content_tag(:div, (
+      content_tag(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};") +
+        content_tag(:h2, link_to(image_icon + content_tag(:span, topic.title), topic.view_url))
+    ), :class => 'topic-title')
+  end
+
+end
@@ -1,53 +0,0 @@
-(function basic_time(container) {
-
-  var
-    d1    = [],
-    start = new Date("2009/01/01 01:00").getTime(),
-    options,
-    graph,
-    i, x, o;
-
-  for (i = 0; i < 100; i++) {
-    x = start+(i*1000*3600*24*36.5);
-    d1.push([x, i+Math.random()*30+Math.sin(i/20+Math.random()*2)*20+Math.sin(i/10+Math.random())*10]);
-  }
-        
-  options = {
-    xaxis : {
-      mode : 'time', 
-      labelsAngle : 45
-    },
-    selection : {
-      mode : 'x'
-    },
-    HtmlText : false,
-    title : 'Time'
-  };
-        
-  // Draw graph with default options, overwriting with passed options
-  function drawGraph (opts) {
-
-    // Clone the options, so the 'options' variable always keeps intact.
-    o = Flotr._.extend(Flotr._.clone(options), opts || {});
-
-    // Return a new graph.
-    return Flotr.draw(
-      container,
-      [ d1 ],
-      o
-    );
-  }
-
-  graph = drawGraph();      
-        
-  Flotr.EventAdapter.observe(container, 'flotr:select', function(area){
-    // Draw selected area
-    graph = drawGraph({
-      xaxis : { min : area.x1, max : area.x2, mode : 'time', labelsAngle : 45 },
-      yaxis : { min : area.y1, max : area.y2 }
-    });
-  });
-        
-  // When graph is clicked, draw the graph with default area.
-  Flotr.EventAdapter.observe(container, 'flotr:click', function () { graph = drawGraph(); });
-})(document.getElementById("editor-render-0"));
@@ -10,9 +10,9 @@ jQuery(document).ready(function($) {
   });
   function proposalsScroll() {
-    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list');
+    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals');
     var nextSelector = 'div.more a';
-    if(scroll.data('jscroll')) scroll.jscroll.destroy();
+    if(scroll.data('jscroll')) scroll.data('jscroll', null);
     if(scroll.find(nextSelector).length > 0) {
       scroll.jscroll({
@@ -31,6 +31,12 @@ jQuery(document).ready(function($) {
     $('.topics').masonry();
   });
   $('.topics').masonry();
+  $(window).resize(function() {
+    $('.topics').masonry();
+  });
+  $(window).bind('toggleFullwidth', function() {
+    $('.topics').masonry();
+  });
 });
 function loadSocialButtons() {
@@ -156,11 +156,14 @@ form .proposals-discussion-plugin .body textarea {
 #content .topic-item h2 a, #article .article-body-proposals-discussion-plugin_topic h2 a,
 #content .topic h2 a {
   text-decoration: none;
-  padding: 10px;
   display: inline-block;
   width: 94%;
   color: white;
 }
+#content .topic-title h2 span {
+  padding: 10px;
+  display: inline-block;
+}
 .topic-item .topic-content, #article .article-body-proposals-discussion-plugin_topic .topic-content {
   padding: 5px 7px 5px 2px;
 }
@@ -177,7 +180,7 @@ form .proposals-discussion-plugin .body textarea {
   margin: 1px 0 0 0;
 }
-#content .tag_cloud a {
+#content .article-body-proposals-discussion-plugin_topic .tag_cloud a {
   text-decoration: none;
 }
@@ -199,7 +202,7 @@ form .proposals-discussion-plugin .body textarea {
 #content .statistics h5 {
   color: rgb(95, 95, 95);
 }
-#content .tag_cloud {
+#content .article-body-proposals-discussion-plugin_topic .tag_cloud {
   float: right;
   width: 300px;
   box-shadow: 5px 5px 5px -2px #ddd;
@@ -219,3 +222,13 @@ form .proposals-discussion-plugin .body textarea {
   clear: both;
   padding-top: 10px;
 }
+
+.proposal .actions .fb-share-button {
+  top: -3px;
+}
+
+.topic-title h2 img {
+  max-height: 36px;
+  vertical-align: middle;
+  padding: 4px 0 4px 4px;
+}
@@ -35,4 +35,48 @@ class ProposalsDiscussionPluginPublicControllerTest &lt; ActionController::TestCase
     assert_equal [proposal2, proposal3, proposal1], assigns(:proposals)
   end
+  should 'load proposals with most commented order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal1', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal2', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal3', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+
+    author = fast_create(Person)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+
+    get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'most_commented'
+    assert_equal [proposal2, proposal3, proposal1], assigns(:proposals)
+  end
+
+  should 'load proposals with most recent order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'b', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'k', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+
+    author = fast_create(Person)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+
+    get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'recent'
+    assert_equal [proposal3, proposal2, proposal1], assigns(:proposals)
+  end
+
+  should 'load proposals with most recently commented order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal1', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal2', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal3', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+
+    author = fast_create(Person)
+    Comment.create!({:source => proposal2, :body => 'text', :author => author, :created_at => 10.days.ago}, :without_protection => true)
+    Comment.create!({:source => proposal2, :body => 'text', :author => author, :created_at => 10.days.ago}, :without_protection => true)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+    Comment.create!(:source => proposal1, :body => 'text', :author => author)
+
+    get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'most_recently_commented'
+    assert_equal [proposal3, proposal1, proposal2], assigns(:proposals)
+  end
+
 end
@@ -29,4 +29,26 @@ class ProposalTest &lt; ActiveSupport::TestCase
     assert !proposal.allow_edit?(fast_create(Person))
   end
+  should 'return body when to_html was called with feed=true' do
+    assert_equal proposal.body, proposal.to_html(:feed => true)
+  end
+
+  should 'return a proc when to_html was called with feed=false' do
+    assert proposal.to_html(:feed => false).kind_of?(Proc)
+  end
+
+  should 'return a proc when to_html was called with no feed parameter' do
+    assert proposal.to_html.kind_of?(Proc)
+  end
+
+  should 'return proposals by discussion' do
+    discussion = fast_create(ProposalsDiscussionPlugin::Discussion)
+    topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+
+    assert_equivalent [proposal1, proposal3], ProposalsDiscussionPlugin::Proposal.from_discussion(discussion)
+  end
+
 end
@@ -5,7 +5,14 @@
 <% title_limit = 70 %>
 <% abstract_limit = 140 %>
+<% extend ProposalsDiscussionPlugin::TopicHelper %>
+
 <div class="proposals-discussion-plugin">
+
+  <div class="topic">
+    <%= topic_title @article.topic %>
+  </div>
+
   <div class="title">
     <%= required labelled_form_field _('Title'), limited_text_area(:article, :name, title_limit, 'title_textarea', :rows => 1) %>
   </div>
@@ -11,3 +11,8 @@
 <%= labelled_colorpicker_field(_('Color:'), :article, :color) %>
 <span id="color_preview" class = "color_marker" style="background-color: <%= @article.color %>" ></span>
+
+<%= f.fields_for :image_builder, @article.image do |i| %>
+  <%= file_field_or_thumbnail(_('Image:'), @article.image, i)%>
+  <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+<% end %>
@@ -12,7 +12,7 @@
 <% order ||= 'random' %>
 <div class="proposals_list">
   <div class="filters">
-    <% [[_('Random'), :random], [_('Aplhabetical'), :alphabetical]].each_with_index do |order, i| %>
+    <% sort_criteria.each_with_index do |order, i| %>
       <%= link_to order.first, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order.second}), :remote => true, :class => "order #{order.second} #{i==0 ? 'selected':''}" %>
     <% end %>
   </div>
 <a href="https://twitter.com/share" class="twitter-share-button" data-url="<%= url_for proposal.view_url %>" data-text="<%= proposal.title %>" data-count="none"></a>
-<div class="fb-share-button" data-href="<%= url_for proposal.view_url %>" data-layout="box-count"></div>
+<div class="fb-share-button" data-href="<%= url_for proposal.view_url %>"></div>
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
+<%= add_rss_feed_to_head(@page.name, @page.feed.url) if @page.feed %>
+
 <div class="description">
   <%= @page.body %>
 </div>
@@ -2,9 +2,10 @@
   <h5><%= @page.topic.discussion.title %> </h5>
 </div>
+<% extend ProposalsDiscussionPlugin::TopicHelper %>
+
 <div class="topic">
-  <div class="topic-color" style="background-color: <%= @page.topic.color %>;"></div>
-  <h2><%= link_to @page.topic.title, @page.topic.view_url %></h2>
+  <%= topic_title @page.topic %>
 </div>
 <div class="title">
@@ -4,8 +4,8 @@
   <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 <% end %>
-<div class="topic-color" style="background-color: <%= topic.color %>;"></div>
-<h2><%= link_to topic.title, topic.view_url %></h2>
+<% extend ProposalsDiscussionPlugin::TopicHelper %>
+<%= topic_title topic %>
 <div class="topic-content">
@@ -16,7 +16,7 @@
     <h3><%= _('Select topic') %></h3>
     <div id="topics">
-      <% @discussion.children.each do |topic| %>
+      <% @discussion.topics.each do |topic| %>
         <h4>
           <%= radio_button_tag('discussion[topic]', topic.id) %>
           <%= topic.title %>
@@ -1037,7 +1037,7 @@ jQuery(document).ready(function(){
 function apply_zoom_to_images(zoom_text) {
   jQuery(function($) {
     $(window).load( function() {
-      $('#article .article-body img').each( function(index) {
+      $('#article .article-body img:not(.disable-zoom)').each( function(index) {
         var original = original_image_dimensions($(this).attr('src'));
         if ($(this).width() < original['width'] || $(this).height() < original['height']) {
           $(this).wrap('<div class="zoomable-image" />');
@@ -1083,6 +1083,7 @@ function toggle_fullwidth(itemId){
     jQuery("#fullscreen-btn").hide()
     fullwidth = true;
   }
+  jQuery(window).trigger("toggleFullwidth", fullwidth);
 }
 function fullscreenPageLoad(itemId){
	@@ -15,7 +15,7 @@ gem 'thin', '~> 1.3.1'		@@ -15,7 +15,7 @@ gem 'thin', '~> 1.3.1'
15	gem 'hpricot', '~> 0.8.6'	15	gem 'hpricot', '~> 0.8.6'
16	gem 'nokogiri', '~> 1.5.5'	16	gem 'nokogiri', '~> 1.5.5'
17	gem 'rake', :require => false	17	gem 'rake', :require => false
18	-gem 'grape', '0.2.1'	18	+gem 'grape', '~> 0.2.1'
19	gem 'rest-client', '~> 1.6.7'	19	gem 'rest-client', '~> 1.6.7'
20	gem 'exception_notification', '~> 4.0.1'	20	gem 'exception_notification', '~> 4.0.1'
21	gem 'gettext', '~> 2.2.1', :require => false, :group => :development	21	gem 'gettext', '~> 2.2.1', :require => false, :group => :development
	@@ -19,7 +19,7 @@ class FeedWriter		@@ -19,7 +19,7 @@ class FeedWriter
19	for article in articles	19	for article in articles
20	xml.item do	20	xml.item do
21	xml.title(article.name)	21	xml.title(article.name)
22	- xml.description(article.to_html)	22	+ xml.description(article.to_html(:feed => true))
23	if article.created_at	23	if article.created_at
24	# rfc822	24	# rfc822
25	xml.pubDate(article.created_at.rfc2822)	25	xml.pubDate(article.created_at.rfc2822)
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+class DspacePluginController < PublicController
	2	+ append_view_path File.join(File.dirname(__FILE__) + '/../views')
	3	+
	4	+ def view_item
	5	+
	6	+ collection_id = params[:collection_id]
	7	+ item_id = params[:id]
	8	+
	9	+ begin
	10	+ @collection = DspacePlugin::Collection.find(collection_id)
	11	+ rescue ActiveRecord::RecordNotFound
	12	+ render_not_found
	13	+ return
	14	+ end
	15	+
	16	+ begin
	17	+ dspace_server = @collection.parent.parent.dspace_server_url
	18	+ @item = Dspace::Item.get_item_by_id dspace_server, item_id
	19	+ rescue ActiveResource::UnauthorizedAccess
	20	+ render_not_found
	21	+ return
	22	+ end
	23	+
	24	+ begin
	25	+ @collection = DspacePlugin::Collection.find(collection_id)
	26	+ rescue ActiveRecord::RecordNotFound
	27	+ render_not_found
	28	+ return
	29	+ end
	30	+
	31	+ end
	32	+
	33	+end
@@ -0,0 +1,72 @@		@@ -0,0 +1,72 @@
	1	+class DspacePluginMyprofileController < CmsController
	2	+ append_view_path File.join(File.dirname(__FILE__) + '/../views')
	3	+
	4	+ def new
	5	+
	6	+ @success_back_to = params[:success_back_to]
	7	+
	8	+ @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
	9	+ record_coming
	10	+ @type = params[:type]
	11	+ if @type.blank?
	12	+ @article_types = []
	13	+ available_article_types.each do \|type\|
	14	+ @article_types.push({
	15	+ :class => type,
	16	+ :short_description => type.short_description,
	17	+ :description => type.description
	18	+ })
	19	+ end
	20	+ @parent_id = params[:parent_id]
	21	+ render :action => 'select_article_type', :layout => false, :back_to => @back_to
	22	+ return
	23	+ else
	24	+ refuse_blocks
	25	+ end
	26	+
	27	+ raise "Invalid article type #{@type}" unless valid_article_type?(@type)
	28	+
	29	+ klass = @type.constantize
	30	+ article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {}
	31	+ article_data.merge!(params[:article]) if params[:article]
	32	+
	33	+ if @type == 'DspacePlugin::Collection'
	34	+ dspace_objects = article_data['dspace_collections']
	35	+ elsif @type == 'DspacePlugin::Communityy'
	36	+ dspace_objects = article_data['dspace_communities']
	37	+ end
	38	+
	39	+ dspace_objects.each do \|object\|
	40	+
	41	+ entity = klass.new
	42	+
	43	+ parent = check_parent(params[:parent_id])
	44	+
	45	+ if parent
	46	+ entity.parent = parent
	47	+ parent_id = parent.id
	48	+ end
	49	+
	50	+ if @type == 'DspacePlugin::Communityy'
	51	+ entity.dspace_community_id = object['id']
	52	+ elsif @type == 'DspacePlugin::Collection'
	53	+ entity.dspace_community_id = article_data['dspace_community_id']
	54	+ entity.dspace_collection_id = object['id']
	55	+ entity.accept_comments = false
	56	+ end
	57	+
	58	+ entity.name = object['name']
	59	+ entity.profile = profile
	60	+ entity.author = user
	61	+ entity.last_changed_by = user
	62	+ entity.created_by = user
	63	+
	64	+ entity.save!
	65	+
	66	+ end
	67	+
	68	+ redirect_to @parent.view_url
	69	+
	70	+ end
	71	+
	72	+end
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+class Dspace::Collection < Dspace::Resource
	2	+
	3	+ def self.get_all_items_from(dspace_server, collection_id)
	4	+ self.site = dspace_server
	5	+ result = self.find collection_id, :params => { :expand => 'items' }
	6	+
	7	+ item_list = []
	8	+
	9	+ if result.items.count > 0
	10	+ result.items.each { \|element\|
	11	+ item = Dspace::Item.get_item_by_id dspace_server, element.id
	12	+ item_list << item
	13	+ }
	14	+ end
	15	+
	16	+ item_list
	17	+ end
	18	+
	19	+ def self.get_all_collections_from(dspace_server)
	20	+ self.site = dspace_server
	21	+ self.find(:all)
	22	+ end
	23	+
	24	+end
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+class Dspace::Community < Dspace::Resource
	2	+
	3	+ def self.get_all_communities_from(dspace_server)
	4	+ self.site = dspace_server
	5	+ self.find(:all)
	6	+ end
	7	+
	8	+ def self.get_all_collections_from(dspace_server, community_id)
	9	+ self.site = dspace_server
	10	+ result = self.find community_id, :params => { :expand => 'collections' }
	11	+ result.collections
	12	+ end
	13	+
	14	+end
@@ -0,0 +1,89 @@		@@ -0,0 +1,89 @@
	1	+class Dspace::Item < Dspace::Resource
	2	+
	3	+ def self.get_all_item_metadata_from(dspace_server, item_id)
	4	+ self.site = dspace_server
	5	+ result = self.find item_id, :params => { :expand => 'metadata' }
	6	+ result.metadata
	7	+ end
	8	+
	9	+ def self.get_item_by_id(dspace_server, item_id)
	10	+ self.site = dspace_server
	11	+ result = self.find item_id, :params => { :expand => 'metadata' }
	12	+
	13	+ item_metadata = Dspace::Item.get_all_item_metadata_from self.site, result.id
	14	+
	15	+ # author
	16	+ metadata = item_metadata[0].attributes
	17	+ if metadata != {}
	18	+ metadata = Hash[[metadata.map{\|k,v\| v}]]
	19	+ author = metadata.has_key?('dc.contributor.author') ? metadata['dc.contributor.author'] : nil
	20	+ end
	21	+
	22	+ # issue date
	23	+ metadata = item_metadata[3].attributes
	24	+ if metadata != {}
	25	+ metadata = Hash[[metadata.map{\|k,v\| v}]]
	26	+ issue_date = metadata.has_key?('dc.date.issued') ? metadata['dc.date.issued'] : nil
	27	+ end
	28	+
	29	+ # uri
	30	+ metadata = item_metadata[4].attributes
	31	+ if metadata != {}
	32	+ metadata = Hash[[metadata.map{\|k,v\| v}]]
	33	+ uri = metadata.has_key?('dc.identifier.uri') ? metadata['dc.identifier.uri'] : nil
	34	+ end
	35	+
	36	+ # description
	37	+ metadata = item_metadata[5].attributes
	38	+ if metadata != {}
	39	+ metadata = Hash[[metadata.map{\|k,v\| v}]]
	40	+ abstract = metadata.has_key?('dc.description') ? metadata['dc.description'] : nil
	41	+ end
	42	+
	43	+ # abstract
	44	+ metadata = item_metadata[6].attributes
	45	+ if metadata != {}
	46	+ metadata = Hash[[metadata.map{\|k,v\| v}]]
	47	+ description = metadata.has_key?('dc.description.abstract') ? metadata['dc.description.abstract'] : nil
	48	+ end
	49	+
	50	+ item = DspacePlugin::Item.new
	51	+
	52	+ item.id = result.id
	53	+ item.name = result.name
	54	+ item.author = author
	55	+ item.issue_date = issue_date
	56	+ item.abstract = abstract
	57	+ item.description = description
	58	+ item.uri = uri
	59	+
	60	+ ### BITSTREAMS
	61	+
	62	+ item_bitstreams = self.find item_id, :params => { :expand => 'bitstreams' }
	63	+
	64	+ bitstreams = item_bitstreams.bitstreams
	65	+
	66	+ bitstreams.each do \|bs\|
	67	+ bitstream = DspacePlugin::Bitstream.new
	68	+ bitstream.id = bs.attributes[:id]
	69	+ bitstream.name = bs.attributes[:name]
	70	+ bitstream.description = bs.attributes[:description]
	71	+ bitstream.mimetype = bs.attributes[:mimeType]
	72	+ bitstream.size_bytes = bs.attributes[:sizeBytes]
	73	+ bitstream.retrieve_link = bs.attributes[:retrieveLink]
	74	+ bitstream.format = bs.attributes[:format]
	75	+ bitstream.link = bs.attributes[:link]
	76	+
	77	+ item.files << bitstream
	78	+
	79	+ end
	80	+
	81	+ if item.files.count > 0
	82	+ item.mimetype = item.files.first.mimetype
	83	+ end
	84	+
	85	+ item
	86	+
	87	+ end
	88	+
	89	+end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class Dspace::Resource < ActiveResource::Base
	2	+
	3	+ class << self
	4	+ def element_path(id, prefix_options = {}, query_options = nil)
	5	+ prefix_options, query_options = split_options(prefix_options) if query_options.nil?
	6	+ "#{prefix(prefix_options)}#{collection_name}/#{id}#{query_string(query_options)}"
	7	+ end
	8	+
	9	+ def collection_path(prefix_options = {}, query_options = nil)
	10	+ prefix_options, query_options = split_options(prefix_options) if query_options.nil?
	11	+ "#{prefix(prefix_options)}#{collection_name}#{query_string(query_options)}"
	12	+ end
	13	+ end
	14	+
	15	+end
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+class DspacePlugin < Noosfero::Plugin
	2	+
	3	+ def self.plugin_name
	4	+ "DSpace Plugin"
	5	+ end
	6	+
	7	+ def self.plugin_description
	8	+ _("A plugin that add a DSpace library feature to noosfero.")
	9	+ end
	10	+
	11	+ def content_types
	12	+ if context.respond_to?(:params) && context.params
	13	+ types = []
	14	+ parent_id = context.params[:parent_id]
	15	+ types << DspacePlugin::Library if context.profile.community? && !parent_id
	16	+ parent = parent_id ? context.profile.articles.find(parent_id) : nil
	17	+ if parent.kind_of?(DspacePlugin::Library)
	18	+ types << DspacePlugin::Communityy
	19	+ elsif parent.kind_of?(DspacePlugin::Communityy)
	20	+ types << DspacePlugin::Collection
	21	+ end
	22	+ types
	23	+ else
	24	+ [DspacePlugin::Library, DspacePlugin::Collection, DspacePlugin::Communityy]
	25	+ end
	26	+ end
	27	+
	28	+ def stylesheet?
	29	+ true
	30	+ end
	31	+
	32	+ def self.has_admin_url?
	33	+ false
	34	+ end
	35	+
	36	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class DspacePlugin::Bitstream
	2	+
	3	+ attr_accessor :id, :name, :description, :mimetype, :size_bytes, :retrieve_link, :format, :link
	4	+
	5	+end