dspace_plugin : improve ui navigation

Francisco Júnior
1 parent 51ea425f
Showing 16 changed files with 98 additions and 74 deletions Show diff stats
plugins/dspace/lib/dspace/client.rb
plugins/dspace/lib/dspace/collection.rb
plugins/dspace/lib/dspace/community.rb
plugins/dspace/lib/dspace_plugin/communityy.rb
plugins/dspace/lib/dspace_plugin/item.rb
plugins/dspace/lib/dspace_plugin/library.rb
plugins/dspace/public/style.css
plugins/dspace/views/cms/dspace_plugin/_collection.html.erb
plugins/dspace/views/cms/dspace_plugin/_communityy.html.erb
plugins/dspace/views/content_viewer/_collection.html.erb
plugins/dspace/views/content_viewer/_collection_item.html.erb
plugins/dspace/views/content_viewer/_community_item.html.erb
plugins/dspace/views/content_viewer/_item.html.erb
plugins/dspace/views/content_viewer/collection.html.erb
plugins/dspace/views/content_viewer/community.html.erb
plugins/dspace/views/content_viewer/library.html.erb
@@ -9,7 +9,7 @@ class Dspace::Client
   end
   def get_communities
-    Dspace::Community.find(:all)
+    Dspace::Community.get_all_communities_from @server_url
   end
 end
@@ -4,18 +4,41 @@ class Dspace::Collection &lt; Dspace::Resource
     self.site = dspace_server
     result = self.find collection_id, :params => { :expand => 'items' }
-    #if result.items.count > 0
+    item_list = []
-    #  result.items.each { |item|
+    if result.items.count > 0
-    #    item_metadata = Dspace::Item.get_all_item_metadata_from dspace_server, item.id
-        #raise item_metadata.count.inspect
-    #    raise item_metadata.inspect
+      result.items.each { |element|
-    #  }
-    #end
+        item_metadata = Dspace::Item.get_all_item_metadata_from dspace_server, element.id
-    result.items
+        # 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
+
+        # date issued
+        metadata = item_metadata[3].attributes
+        if metadata != {}
+          metadata = Hash[[metadata.map{|k,v| v}]]
+          date_issued = metadata.has_key?('dc.date.issued') ? metadata['dc.date.issued'] : nil
+        end
+
+        item = DspacePlugin::Item.new
+
+        item.id = element.id
+        item.name = element.name
+        item.author = author
+        item.date_issued = date_issued
+
+        item_list << item
+
+      }
+    end
+
+    item_list
   end
   def self.get_all_collections_from(dspace_server)
 class Dspace::Community < Dspace::Resource
-  self.site = "http://dev.maljr.net:8080/rest/"
-  def self.get_collections(community_id)
+  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
@@ -23,4 +23,8 @@ class DspacePlugin::Communityy &lt; Article
     end
   end
+  def collections(dspace_server, community_id)
+    Dspace::Community.get_all_collections_from dspace_server, community_id
+  end
+
 end
-class DspacePlugin::Item < Article
+class DspacePlugin::Item
-  settings_items :dspace_collection_id, :type => :string
-
-  attr_accessible :dspace_collection_id
-
-  def self.icon_name(article = nil)
-    'dspace'
-  end
-
-  def self.short_description
-    _("DSpace item")
-  end
-
-  def self.description
-    _("Defines a item on DSpace library")
-  end
-
-  def to_html(options = {})
-    dspace_item = self
-    proc do
-      render :file => 'content_viewer/item', :locals => {:dspace_item => dspace_item}
-    end
-  end
+  attr_accessor :id, :name, :author, :date_issued
 end
@@ -25,7 +25,7 @@ class DspacePlugin::Library &lt; Blog
   end
   def communities
-    DspacePlugin::Communities.find(:all)
+    DspacePlugin::Communityy.find(:all)
   end
   def collections
@@ -6,3 +6,18 @@
 #dspace_library li {
   list-style-image: url(/designs/themes/base/imgs/li-recent.gif);
 }
+
+#dspace_library li.item,
+#dspace_library li.collection {
+  margin: 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;
+}
@@ -8,8 +8,6 @@
 <% dspace_server_url = @article.parent.server_url %>
-<%#= hidden_field_tag 'article[server_url]', dspace_server_url %>
-
 <% dspace_client = Dspace::Client.new(dspace_server_url) %>
 <% collections = dspace_client.get_collections.map { |collection| item = [_(collection.name), collection.id] } %>
@@ -18,5 +16,3 @@
       select(:article,
              :dspace_collection_id,
              options_for_select_with_title(collections))) %>
-
-<% #raise collections_2.inspect %>
@@ -6,19 +6,13 @@
 <%= hidden_field_tag 'article[parent_id]', @article.parent_id %>
-<% dspace_client = Dspace::Client.new('') %>
+<% dspace_server_url = @article.parent.server_url %>
-<% communities = dspace_client.get_communities %>
+<% dspace_client = Dspace::Client.new(dspace_server_url) %>
-<%
-communities_2 = communities.map { |community|
-  item = [_(community.name), community.id]
-}
-%>
+<% communities = dspace_client.get_communities.map { |community| item = [_(community.name), community.id] } %>
 <%= labelled_form_field(_('Communities:'),
       select(:article,
              :dspace_community_id,
-             options_for_select_with_title(communities_2))) %>
-
-<% #raise collections_2.inspect %>
+             options_for_select_with_title(communities))) %>
@@ -0,0 +1,3 @@
+<li class="collection">
+  <span class="title"><%= collection.name %></span><br />
+</li>
-<li>
-  <h4><%= link_to collection_item.title, :controller => 'content_viewer', :action => 'view_page', :page => collection_item.path %>
-  </h4>
+<li class="collection">
+  <span class="title"><%= link_to collection_item.title, :controller => 'content_viewer', :action => 'view_page', :page => collection_item.path %></span>
 </li>
-hello!
+<li class="community">
+  <span class="title"><%= link_to community_item.title, :controller => 'content_viewer', :action => 'view_page', :page => community_item.path %></span>
+</li>
-<li>
-  <h5><%= item.name %></h5>
+<li class="item">
+  <span class="name"><%= item.name %></span><br />
+  <span class="authors"><%= item.author %></span> <span class="date_issued">(<%= item.date_issued %>)</span>
 </li>
@@ -3,7 +3,7 @@
 <div id="dspace_library">
   <div id="dspace_collection">
-    <ul id="items_list" class="items_list">
+    <ul id="items_list">
       <%= render :partial => 'item', :collection => dspace_collection.items(dspace_server, collection_id) %>
     </ul>
   </div>
-<% dspace_community_id = 5 %>
+<% community_id = dspace_community.dspace_community_id %>
+<% dspace_server = dspace_community.parent.server_url %>
-<% dspace_collections_from_community = Dspace::Community.get_collections(dspace_community_id) %>
-
-<% dspace_collections_from_community.each { |collection| %>
-<br />
-<%= collection.name %>
-<br />
-<% } %>
+<div id="dspace_library">
+  <div id="dspace_community">
+    <ul id="collection_list">
+      <%= render :partial => 'collection', :collection => dspace_community.collections(dspace_server, community_id) %>
+    </ul>
+  </div>
+</div>
@@ -4,11 +4,9 @@
   <% if dspace_library.gather_option == "communities" %>
-  <h3><%= _("Communities") %></h3>
-
   <% if true %>
-  <div class="library_actions">
+  <div id="actions">
     <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "DspacePlugin::Communityy", :parent_id => dspace_library.id}), :class => 'button with-text icon-add') do %>
           <%= _("New %s") % DspacePlugin::Communityy.short_description %>
     <% end %>
@@ -16,19 +14,19 @@
   <% end %>
+  <% communities = dspace_library.communities %>
+
   <ul id="sortable" class="communities_list">
-    <%= render :partial => 'community_item', :collection => dspace_library.communities %>
+    <%= render :partial => 'community_item', :collection => communities %>
   </ul>
   <% end %>
   <% if dspace_library.gather_option == "collections" %>
-  <h3><%= _("Collections") %></h3>
-
     <% if true %>
-  <div class="library_actions">
+  <div id="actions">
     <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "DspacePlugin::Collection", :parent_id => dspace_library.id}), :class => 'button with-text icon-add') do %>
           <%= _("New %s") % DspacePlugin::Collection.short_description %>
     <% end %>
@@ -36,9 +34,13 @@
     <% end %>
-  <ul id="collections_list" class="collections_list">
-    <%= render :partial => 'collection_item', :collection => dspace_library.collections %>
-  </ul>
+  <% collections = dspace_library.collections %>
+
+    <% unless collections.blank? %>
+    <ul id="collections_list" class="collections_list">
+      <%= render :partial => 'collection_item', :collection => collections  %>
+    </ul>
+    <% end %>
   <% end %>
	@@ -9,7 +9,7 @@ class Dspace::Client		@@ -9,7 +9,7 @@ class Dspace::Client
9	end	9	end
10		10
11	def get_communities	11	def get_communities
12	- Dspace::Community.find(:all)	12	+ Dspace::Community.get_all_communities_from @server_url
13	end	13	end
14		14
15	end	15	end
	@@ -4,18 +4,41 @@ class Dspace::Collection < Dspace::Resource		@@ -4,18 +4,41 @@ class Dspace::Collection < Dspace::Resource
4	self.site = dspace_server	4	self.site = dspace_server
5	result = self.find collection_id, :params => { :expand => 'items' }	5	result = self.find collection_id, :params => { :expand => 'items' }
6		6
7	- #if result.items.count > 0	7	+ item_list = []
8		8
9	- # result.items.each { \|item\|	9	+ if result.items.count > 0
10		10
11	- # item_metadata = Dspace::Item.get_all_item_metadata_from dspace_server, item.id
12	- #raise item_metadata.count.inspect
13	- # raise item_metadata.inspect	11	+ result.items.each { \|element\|
14		12
15	- # }
16	- #end	13	+ item_metadata = Dspace::Item.get_all_item_metadata_from dspace_server, element.id
17		14
18	- result.items	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	+ # date issued
		23	+ metadata = item_metadata[3].attributes
		24	+ if metadata != {}
		25	+ metadata = Hash[[metadata.map{\|k,v\| v}]]
		26	+ date_issued = metadata.has_key?('dc.date.issued') ? metadata['dc.date.issued'] : nil
		27	+ end
		28	+
		29	+ item = DspacePlugin::Item.new
		30	+
		31	+ item.id = element.id
		32	+ item.name = element.name
		33	+ item.author = author
		34	+ item.date_issued = date_issued
		35	+
		36	+ item_list << item
		37	+
		38	+ }
		39	+ end
		40	+
		41	+ item_list
19	end	42	end
20		43
21	def self.get_all_collections_from(dspace_server)	44	def self.get_all_collections_from(dspace_server)
	@@ -23,4 +23,8 @@ class DspacePlugin::Communityy < Article		@@ -23,4 +23,8 @@ class DspacePlugin::Communityy < Article
23	end	23	end
24	end	24	end
25		25
		26	+ def collections(dspace_server, community_id)
		27	+ Dspace::Community.get_all_collections_from dspace_server, community_id
		28	+ end
		29	+
26	end	30	end
1	-class DspacePlugin::Item < Article	1	+class DspacePlugin::Item
2		2
3	- settings_items :dspace_collection_id, :type => :string
4	-
5	- attr_accessible :dspace_collection_id
6	-
7	- def self.icon_name(article = nil)
8	- 'dspace'
9	- end
10	-
11	- def self.short_description
12	- _("DSpace item")
13	- end
14	-
15	- def self.description
16	- _("Defines a item on DSpace library")
17	- end
18	-
19	- def to_html(options = {})
20	- dspace_item = self
21	- proc do
22	- render :file => 'content_viewer/item', :locals => {:dspace_item => dspace_item}
23	- end
24	- end	3	+ attr_accessor :id, :name, :author, :date_issued
25		4
26	end	5	end
	@@ -25,7 +25,7 @@ class DspacePlugin::Library < Blog		@@ -25,7 +25,7 @@ class DspacePlugin::Library < Blog
25	end	25	end
26		26
27	def communities	27	def communities
28	- DspacePlugin::Communities.find(:all)	28	+ DspacePlugin::Communityy.find(:all)
29	end	29	end
30		30
31	def collections	31	def collections
	@@ -6,3 +6,18 @@		@@ -6,3 +6,18 @@
6	#dspace_library li {	6	#dspace_library li {
7	list-style-image: url(/designs/themes/base/imgs/li-recent.gif);	7	list-style-image: url(/designs/themes/base/imgs/li-recent.gif);
8	}	8	}
		9	+
		10	+#dspace_library li.item,
		11	+#dspace_library li.collection {
		12	+ margin: 10px 0;
		13	+}
		14	+
		15	+#dspace_library li.item span.name,
		16	+#dspace_library li.collection span.title,
		17	+#dspace_library li.community span.title {
		18	+ font-weight: bold;
		19	+}
		20	+
		21	+#dspace_library div#actions {
		22	+ margin: 10px 0;
		23	+}
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<li class="collection">
	2	+ <span class="title"><%= collection.name %></span><br />
	3	+</li>
1	-<li>
2	- <h4><%= link_to collection_item.title, :controller => 'content_viewer', :action => 'view_page', :page => collection_item.path %>
3	- </h4>	1	+<li class="collection">
		2	+ <span class="title"><%= link_to collection_item.title, :controller => 'content_viewer', :action => 'view_page', :page => collection_item.path %></span>
4	</li>	3	</li>
1	-hello!	1	+<li class="community">
		2	+ <span class="title"><%= link_to community_item.title, :controller => 'content_viewer', :action => 'view_page', :page => community_item.path %></span>
		3	+</li>
1	-<li>
2	- <h5><%= item.name %></h5>	1	+<li class="item">
		2	+ <span class="name"><%= item.name %></span><br />
		3	+ <span class="authors"><%= item.author %></span> <span class="date_issued">(<%= item.date_issued %>)</span>
3	</li>	4	</li>