diff --git a/app/assets/images/icons/collection-add.png b/app/assets/images/icons/collection-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fa684519e819dd3fe909bce96375fad0b335193
Binary files /dev/null and b/app/assets/images/icons/collection-add.png differ
diff --git a/app/assets/images/icons/collection-download.png b/app/assets/images/icons/collection-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad972bdd8a05349a39e45731032a2e14a7eb496e
Binary files /dev/null and b/app/assets/images/icons/collection-download.png differ
diff --git a/app/assets/images/icons/collection-fast.png b/app/assets/images/icons/collection-fast.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6ab41783c1e3c7c4e2191d3a35e5c7e2b79d017
Binary files /dev/null and b/app/assets/images/icons/collection-fast.png differ
diff --git a/app/assets/images/icons/collection-items.png b/app/assets/images/icons/collection-items.png
new file mode 100644
index 0000000000000000000000000000000000000000..22190a91f0866488651423c67da56d54d411910f
Binary files /dev/null and b/app/assets/images/icons/collection-items.png differ
diff --git a/app/assets/images/icons/collection-remove.png b/app/assets/images/icons/collection-remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..863bb099f22a6c7c57bb6239727231ecb41b1f30
Binary files /dev/null and b/app/assets/images/icons/collection-remove.png differ
diff --git a/app/assets/images/icons/collection.png b/app/assets/images/icons/collection.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba020f3199a45af971987ad77a5cfb83f8a81609
Binary files /dev/null and b/app/assets/images/icons/collection.png differ
diff --git a/app/assets/images/icons/comments.png b/app/assets/images/icons/comments.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6e736420a7c5d71982c603cc471733e680135b0
Binary files /dev/null and b/app/assets/images/icons/comments.png differ
diff --git a/app/assets/images/icons/contrast.png b/app/assets/images/icons/contrast.png
new file mode 100644
index 0000000000000000000000000000000000000000..acb1f5b8447cf69fbf2645a3b1bb6f215d0ee684
Binary files /dev/null and b/app/assets/images/icons/contrast.png differ
diff --git a/app/assets/images/icons/download.png b/app/assets/images/icons/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..af9243b430f11515a84a224bcae47b93ef11f1e0
Binary files /dev/null and b/app/assets/images/icons/download.png differ
diff --git a/app/assets/images/icons/filter.png b/app/assets/images/icons/filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bf31b8cebf7fdfdfd922676ce2a95c6e74bc408
Binary files /dev/null and b/app/assets/images/icons/filter.png differ
diff --git a/app/assets/images/icons/font-minus.png b/app/assets/images/icons/font-minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..53c8d5c33d9671bc2e0ee4f3ac95de40b75307ac
Binary files /dev/null and b/app/assets/images/icons/font-minus.png differ
diff --git a/app/assets/images/icons/font-plus.png b/app/assets/images/icons/font-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0d32fd6f4a2a6d60bdbaa0c4c4e8641d23eff71
Binary files /dev/null and b/app/assets/images/icons/font-plus.png differ
diff --git a/app/assets/images/icons/report-circle.png b/app/assets/images/icons/report-circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5d078817dca175f6f9a01ec9271ca44da5c1f6c
Binary files /dev/null and b/app/assets/images/icons/report-circle.png differ
diff --git a/app/assets/images/icons/report.png b/app/assets/images/icons/report.png
new file mode 100644
index 0000000000000000000000000000000000000000..a26bb4aab44e9806465f0f69dfc60c18e661b66f
Binary files /dev/null and b/app/assets/images/icons/report.png differ
diff --git a/app/assets/images/icons/search.png b/app/assets/images/icons/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..3faefcad4dded07baee7fe6a7da06cc0842f137c
Binary files /dev/null and b/app/assets/images/icons/search.png differ
diff --git a/app/assets/images/icons/selection-copy.png b/app/assets/images/icons/selection-copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dabd051939bc6c97786f3e2246aebf7cdefcd81
Binary files /dev/null and b/app/assets/images/icons/selection-copy.png differ
diff --git a/app/assets/images/icons/selection-download.png b/app/assets/images/icons/selection-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..46168302edc3557bdcdccd1aea08111881defe07
Binary files /dev/null and b/app/assets/images/icons/selection-download.png differ
diff --git a/app/assets/images/icons/selection-move.png b/app/assets/images/icons/selection-move.png
new file mode 100644
index 0000000000000000000000000000000000000000..f242b1b3397e00100c0f9db08fb442b28b2d710b
Binary files /dev/null and b/app/assets/images/icons/selection-move.png differ
diff --git a/app/assets/images/icons/star-gold.png b/app/assets/images/icons/star-gold.png
new file mode 100644
index 0000000000000000000000000000000000000000..14d216f875885a2b3ab8f92ff7129b139da0363e
Binary files /dev/null and b/app/assets/images/icons/star-gold.png differ
diff --git a/app/assets/images/icons/star-grey.png b/app/assets/images/icons/star-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..d56e678777363b947eee5f8a534a6a5bce87ee13
Binary files /dev/null and b/app/assets/images/icons/star-grey.png differ
diff --git a/app/assets/images/icons/upload-add.png b/app/assets/images/icons/upload-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e458c3752b65e7a12d98904ee033fc193a604ab
Binary files /dev/null and b/app/assets/images/icons/upload-add.png differ
diff --git a/app/assets/images/icons/upload.png b/app/assets/images/icons/upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed76e10e18e65b5f1521311c21331b6e3cfeec31
Binary files /dev/null and b/app/assets/images/icons/upload.png differ
diff --git a/app/assets/images/icons/visualization.png b/app/assets/images/icons/visualization.png
new file mode 100644
index 0000000000000000000000000000000000000000..12a1183a472acb3b7e77d2afb241ab54b7fc8288
Binary files /dev/null and b/app/assets/images/icons/visualization.png differ
diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js
index 7e240dc34bbaee04b3fa5bc7d973370b38682fd9..ccf9bf19d494131a5fbf278a52ccb2e963e9c965 100644
--- a/app/assets/javascripts/application/accessibility.js
+++ b/app/assets/javascripts/application/accessibility.js
@@ -18,6 +18,9 @@ var fontSize = function() {
reloadFontSize(size_c);
});
}
+ else {
+ createCookie('fontSize', 0, 365);
+ }
function reloadFontSize(size) {
var i = 0;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 8c6a751c25321c7c8871fdd09c2ade74d4fd49bf..28ab9c33b2a629ab6dbf8fb75e10221087d034d3 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -100,14 +100,13 @@ header {
}
.logo {
margin-top: 10px;
- padding: 0px;
- // font-size: 24px;
- font-weight: bold;
+ padding: 0;
text-align: center;
float: left;
width: 165px;
h3 {
margin-top: 10px;
+ font-weight: 400;
}
a {
color: #FFF;
diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss
index 3fba1f7f108ccb8ddab0ac990eb39db2c5b7fab2..3d9aebffd9c3b00426a9b20727282e3ccc54aa87 100644
--- a/app/assets/stylesheets/application/learning_objects.scss
+++ b/app/assets/stylesheets/application/learning_objects.scss
@@ -24,3 +24,17 @@
}
}
}
+
+.learning-object-vertical {
+
+ .learning-object-thumbnail {
+ max-width: 250px;
+ height: 150px;
+ position: relative;
+ }
+
+}
+
+.glyphicon-eye-open:before, .glyphicon-star:before {
+ margin-right: 5px;
+}
\ No newline at end of file
diff --git a/app/helpers/learning_objects_helper.rb b/app/helpers/learning_objects_helper.rb
index 37aa17b22027af30ad9df0ae7f94bd93b604e9c3..eea95b9a4caf2e8ee370140c660411b841d9cf4b 100644
--- a/app/helpers/learning_objects_helper.rb
+++ b/app/helpers/learning_objects_helper.rb
@@ -4,6 +4,22 @@ module LearningObjectsHelper
categories.to_s
end
+ def learning_object_thumbnail(learning_object)
+ if learning_object.thumbnail == "thumbnai"
+ image_tag('learning-object-preview.png')
+ else
+ image_tag learning_object.thumbnail, alt: learning_object_title(learning_object)
+ end
+ end
+
+ def learning_object_title(learning_object)
+ if learning_object.name.nil?
+ return 'Sem TÃtulo'
+ end
+
+ learning_object.name
+ end
+
def render_learning_object(orientation, learning_object)
case (orientation)
when "vertical"
diff --git a/app/repositories/orient_db/base.rb b/app/repositories/orient_db/base.rb
index a2affd8b1c539330639d69ba580f6e4166b09c43..6544e22fb661e89692fcc9e04a6999401301854a 100644
--- a/app/repositories/orient_db/base.rb
+++ b/app/repositories/orient_db/base.rb
@@ -14,11 +14,6 @@ class OrientDb::Base
build_object result
end
- # Example:
- # list = repository.for(:learning_objects).all
- # list.each do |learning_object|
- # learning_object.inspect <LearningObject model>
- # end
def all
objects_hash = connection.query "SELECT FROM #{odb_class}", :limit => -1
objects = build_objects(objects_hash) || []
@@ -29,6 +24,10 @@ class OrientDb::Base
objects = build_objects(objects_hash) || []
end
+ def destroy(object)
+ connection.command sprintf("DELETE VERTEX %s", object.id)
+ end
+
def create(object)
hash = build_hash(object)
result = connection.create_document(hash)
diff --git a/app/repositories/orient_db/collection_repository.rb b/app/repositories/orient_db/collection_repository.rb
index 80e6b177add29920a2b038400e8267d5baee9449..56f36ebd8e7606f904184479006efa659ec313ae 100644
--- a/app/repositories/orient_db/collection_repository.rb
+++ b/app/repositories/orient_db/collection_repository.rb
@@ -2,13 +2,6 @@ module OrientDb
class CollectionRepository < Base
include OrientDb::Methods::EdgeMethods
- # Usage:
- # repository.for(:collections).destroy collection
- #
- def destroy(collection)
- connection.command sprintf("DELETE VERTEX %s", collection.id)
- end
-
def build_object(args={})
Collection.new(
:id => args["@rid"],
diff --git a/app/repositories/orient_db/subject_repository.rb b/app/repositories/orient_db/subject_repository.rb
index b90fa2b919efcb4a884cb3ea1a2c9744decef128..6bc3f7147c2b06155971e59c8b457e43f7bdad45 100644
--- a/app/repositories/orient_db/subject_repository.rb
+++ b/app/repositories/orient_db/subject_repository.rb
@@ -27,8 +27,8 @@ module OrientDb
learning_object_repository.build_objects(result)
end
- def build_hash
- hash = super
+ def build_hash(object)
+ hash = super(object)
hash.delete("learning_objects")
hash
end
diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb
index da7846d43e95feca1aaad447a48b8b032fd2299f..504d5190d3011f9d9503724c15edb159b87c8e7f 100644
--- a/app/views/learning_objects/_learning_object_horizontal.erb
+++ b/app/views/learning_objects/_learning_object_horizontal.erb
@@ -3,28 +3,24 @@
<div class="media">
<div class="media-left media-middle">
<div class="learning-object-thumbnail">
- <a href="<%= link %>">
- <% if learning_object.thumbnail == "thumbnai" %>
- <%= image_tag('learning-object-preview.png') %>
- <% else %>
- <img src="<%= learning_object.thumbnail %>" alt="Prévia do objeto">
- <% end %>
- <%= render 'learning_objects/actions_buttons' %>
- </a>
+ <%= link_to link do
+ learning_object_thumbnail learning_object
+ end %>
+
+ <% if user_signed_in? %>
+ <%= render 'learning_objects/actions_buttons' %>
+ <% end %>
</div>
</div>
+
<div class="media-body">
- <a href="<%= learning_object_path(id: learning_object.id) %>">
- <% if learning_object.name.nil? %>
- <h4 class="media-heading">Sem TÃtulo</h4>
- <% else %>
- <h4 class="media-heading"><%= learning_object.name %></h4>
- <% end %>
- </a>
+ <%= link_to link do %>
+ <h4><%= learning_object_title learning_object %></h4>
+ <% end %>
- <span>Por <a>Usuário </a></span><br/>
- <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %> </span>
- <span class="glyphicon glyphicon-star"><%= learning_object.likes %> </span><br>
+ <span>Por <%= link_to 'João', '#' %></span><br/>
+ <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %></span>
+ <span class="glyphicon glyphicon-star"><%= learning_object.likes %></span><br>
<% unless learning_object.description.nil? %>
<%= learning_object.description %>
<br/>
diff --git a/app/views/learning_objects/_learning_object_vertical.erb b/app/views/learning_objects/_learning_object_vertical.erb
index 867c51fe7e442c9a194896b3bd904db480d1fd6b..7e6887797cf178618594c96f7c20502db68c7043 100644
--- a/app/views/learning_objects/_learning_object_vertical.erb
+++ b/app/views/learning_objects/_learning_object_vertical.erb
@@ -1,15 +1,15 @@
<div class="learning-object-vertical">
<div class="panel">
<div class="learning-object-thumbnail">
- <a href=""><img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image' class="img-responsive"></a>
- <%= render 'actions_buttons' %>
+ <%= link_to learning_object_path(id: learning_object.id) do
+ learning_object_thumbnail learning_object
+ end %>
+ <% if user_signed_in? %>
+ <%= render 'learning_objects/actions_buttons' %>
+ <% end %>
</div>
<div class="panel-body">
- <% if learning_object.name.nil? %>
- <h4 class="media-heading">Sem TÃtulo</h4>
- <% else %>
- <h4 class="media-heading"><%= learning_object.name %></h4>
- <% end %>
+ <h4 class="media-heading"><%= learning_object_title(learning_object) %></h4>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %> </span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %> </span>
<span>Por <a>Usuário </a></span>
diff --git a/app/views/management/carousels/edit.html.erb b/app/views/management/carousels/edit.html.erb
index e4195ad934da723acd597466b952f9b07b96a7b7..40381273a38d67c2d1aedb64c2a22b9951ae68ef 100644
--- a/app/views/management/carousels/edit.html.erb
+++ b/app/views/management/carousels/edit.html.erb
@@ -1,7 +1,7 @@
-<h1 class="ls-title-intro ls-ico-users">Carousels</h1>
+<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
<ol class="ls-breadcrumb">
- <li><%= link_to 'Carousels', management_carousels_path %></li>
+ <li><%= link_to 'Carrosséis', management_carousels_path %></li>
<li>Administrar</li>
</ol>
diff --git a/app/views/management/carousels/index.html.erb b/app/views/management/carousels/index.html.erb
index 7f36d3e0d777f652869e7cd9a40696d1f7ff0a99..9b794145170bb7ddf7b8e5dca87acc0d1301f954 100644
--- a/app/views/management/carousels/index.html.erb
+++ b/app/views/management/carousels/index.html.erb
@@ -1,4 +1,4 @@
-<h1 class="ls-title-intro ls-ico-users">Carousels</h1>
+<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
<a href="<%= new_management_carousel_path %>" class="ls-btn-primary" aria-expanded="false" role="combobox">Cadastrar
novo</a>
diff --git a/app/views/management/carousels/new.html.erb b/app/views/management/carousels/new.html.erb
index 5cac49569c1a8729509a601370ed1d1bc9bfc4f7..f7a51f48a7c69b3a276a616c5a04c82380e35aa5 100644
--- a/app/views/management/carousels/new.html.erb
+++ b/app/views/management/carousels/new.html.erb
@@ -1,8 +1,8 @@
-<h1 class="ls-title-intro ls-ico-users">Usuários</h1>
+<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
<ol class="ls-breadcrumb">
- <li><a href="#">Usuários</a></li>
- <li>Novo usuário</li>
+ <li><%= link_to 'Carrosséis', management_carousels_path %></li>
+ <li>Novo Carrossel</li>
</ol>
-<%= render 'form' %>
\ No newline at end of file
+<%= render 'form' %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 72a1890474628ba5d6a2bd7a6d8468e4dbf1f848..006c5610489895d1ee2b6a41c119250ceefd9169 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -41,17 +41,20 @@
<%= render @objects[1], orientation: "vertical" %>
<%= render @objects[2], orientation: "vertical" %>
</div>
- </div>
-</div>
+ <div style="clear: both;"></div>
+ <div style="float: right;">
+ <a href="#">Ver todos</a>
+ </div>
+ </div>
-<div class="row">
- <div class="user-collections">
+ <div class="user-files">
<div class="row">
<div class="col-md-6">
<div class="media">
<div class="media-body">
- <h4 class="media-heading">Coleções</h4>
+ <h2 class="media-heading">Coleções</h2>
+ <h4>x items</h4>
</div>
</div>
</div>
@@ -70,6 +73,7 @@
</div>
</div>
+
<div class="row">
<%#= render 'collections/create' %>
</div>
diff --git a/lib/orient_db/methods/edge_methods.rb b/lib/orient_db/methods/edge_methods.rb
index 0e5c8c448fe1059c3b09917ae569dd2c3d340731..a1e13990a82db6473493ccbb38af84397bdb4051 100644
--- a/lib/orient_db/methods/edge_methods.rb
+++ b/lib/orient_db/methods/edge_methods.rb
@@ -2,6 +2,16 @@ module OrientDb
module Methods
module EdgeMethods
+ def create_edges_from_array(edge_class, id, array, unique=false)
+ edges = []
+ array.each do |o|
+ unless unique && edge_exists?(edge_class, id, o.id)
+ edges << create_edge(edge_class, id, o.id)
+ end
+ end
+ edges
+ end
+
##
# Count the number of edges existent
def get_in_edges_count(edge_class, id)
diff --git a/lib/tasks/mainPage.rake b/lib/tasks/mainPage.rake
index 28340ebb86146c1bd67f767e7020207ff13a4607..bb6e25e0c90acd0dc5a38358aeb351779d7be14d 100644
--- a/lib/tasks/mainPage.rake
+++ b/lib/tasks/mainPage.rake
@@ -1,10 +1,11 @@
namespace :mainPage do
desc "Generate the MainPage"
task :highlights => :environment do
- repository = Portalmec::Application.repository
+ include RepositoriesProxy
+ # repository = Portalmec::Application.repository
puts 'Generate the main page subject highlights'
general_highlights = Array.new
- subjects = repository.for(:subject).all
+ subjects = subject_repository.all
subjects.each do |subject|
# select all the learning objects about that subject
objects = subject.learning_objects
@@ -20,17 +21,17 @@ namespace :mainPage do
# add the object to the subject highlight
puts subject.name
- repository.for(:subject).update(subject.id,'set','highlights','[]')
+ subject_repository.update(subject.id,'set','highlights','[]')
objects.each do |object|
- repository.for(:subject).update(subject.id,'add','highlights',object.name)
+ subject_repository.update(subject.id,'add','highlights',object.name)
end
end
puts 'Generating the main page highlights'
- mainPage = repository.for(:mainPage).all.first
+ mainPage = main_page_repository.all.first
rid = mainPage['@rid']
- repository.for(:mainPage).update(rid,'set','highlights','[]')
+ main_page_repository.update(rid,'set','highlights','[]')
general_highlights.each do |general_highlight|
- repository.for(:mainPage).update(rid,'add','highlights',general_highlight.name)
+ main_page_repository.update(rid,'add','highlights',general_highlight.name)
end
end
end
diff --git a/lib/tasks/orientdb.rake b/lib/tasks/orientdb.rake
index 3960b089c79d4eb241ba65c0995d26ddbc2e123c..55a0dd8c0fb89006e8322bc81a02881e1b757698 100644
--- a/lib/tasks/orientdb.rake
+++ b/lib/tasks/orientdb.rake
@@ -62,10 +62,10 @@ namespace :orientdb do
lo.attributes << attribute
end
end
-
- p lo_repo.create_relations(lo)
+
+ lo_repo.create_relations(lo)
end
-
+
offset += limit
end
end
@@ -82,4 +82,4 @@ namespace :orientdb do
hash
end
-end
\ No newline at end of file
+end