diff --git a/app/assets/javascripts/application/learning_objects.coffee b/app/assets/javascripts/application/learning_objects.coffee
index 73baa059e446ec8673cd24fb1e70d3395e8ba919..b50f394bdc37e5076efe2796d8e44d89eaec4d13 100644
--- a/app/assets/javascripts/application/learning_objects.coffee
+++ b/app/assets/javascripts/application/learning_objects.coffee
@@ -3,4 +3,5 @@ $ ->
html: true
content: ->
$('#collections_list_popover').html()
- return
\ No newline at end of file
+
+ return
diff --git a/app/assets/javascripts/management/carousel.coffee b/app/assets/javascripts/management/carousel.coffee
deleted file mode 100644
index 24f83d18bbd38c24c4f7c3c2fc360cd68e857a2a..0000000000000000000000000000000000000000
--- a/app/assets/javascripts/management/carousel.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 71850fcef02c0c9b6b716493705388a96ec35731..6ffbf86f8d12bdd6c92fc5e4bea5cef662e75dbc 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -41,6 +41,7 @@ h1, h2, h3, h4, h5, h6 {
a, a:focus, a:hover {
font-weight: 400;
color: #000;
+ text-decoration: none;
}
.media-heading {
@@ -327,6 +328,7 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
#subject-highlight{
background-color: black !important;
}
+
.field{
input{
color: black !important;
@@ -337,6 +339,16 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
color: black !important;
}
}
+
+ .panel-wrapper{
+ background-color: black !important;
+ border: 2px solid white;
+ .btn{
+ background-color: black !important;
+ border: 5px solid white;
+ border-style: outset;
+ }
+ }
}
.menu-bar-contrast{
background-color: black !important;
diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss
index 8d9085881ae7e5e016607cfc1d30f359465d175f..8f7f64cf9af2009d4f80a394590cd5d66789370c 100644
--- a/app/assets/stylesheets/application/learning_objects.scss
+++ b/app/assets/stylesheets/application/learning_objects.scss
@@ -14,13 +14,19 @@ $background-grey: #e7e7e8;
text-overflow: ellipsis;
}
+ .author-label {
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
.learning-object-thumbnail {
min-width: 250px;
height: 141px;
position: relative;
a > img {
- width: 230px;
+ width: 250px;
height: 141px;
}
diff --git a/app/assets/stylesheets/application/users.scss b/app/assets/stylesheets/application/users.scss
index 98e3d01a1b78b60cdf65c7e3159328736f61c574..9c3b77c7ad93df32b5232873f238e2311bd84c09 100644
--- a/app/assets/stylesheets/application/users.scss
+++ b/app/assets/stylesheets/application/users.scss
@@ -7,11 +7,13 @@ $background-grey: #e7e7e8;
height: 60px;
border-radius: 50%;
}
+
.user-image-small {
width: 40px;
height: 40px;
border-radius: 50%;
}
+
.user-image-tiny {
width: 20px;
height: 20px;
@@ -52,10 +54,18 @@ $background-grey: #e7e7e8;
}
.user-files {
-
+ margin-bottom: 100px;
}
.user-biography {
padding-left: 85px !important;
display: none;
+}
+
+.align-right {
+ text-align: right;
+}
+
+.user-page-subtitle {
+ margin-bottom: 30px;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/application/welcome.scss b/app/assets/stylesheets/application/welcome.scss
index 3bea24b304d41e484adb5806299c056c95ab3791..ca9f369a9679816f4927a6edf1743721aa6d47f4 100644
--- a/app/assets/stylesheets/application/welcome.scss
+++ b/app/assets/stylesheets/application/welcome.scss
@@ -1,3 +1,14 @@
+.panel-wrapper{
+ position: relative;
+ min-height: 500px;
+ min-width: 350px;
+ margin-top: 30px;
+ background-color: #2178F5;
+ color: white;
+}
+.divider{
+ height: 5px;
+}
.general-highlights {
padding-left: 0px;
padding-right: 0px;
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 877924667c44c85880435b2737eb59399b4fbcb9..256d4350dff89ac1c10210e0301a57334ac56aea 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -10,6 +10,7 @@ class CollectionsController < ApplicationController
# GET /collections/1
# GET /collections/1.json
def show
+ @user = @collection.owner
end
# POST /collections/1/like
@@ -61,7 +62,7 @@ class CollectionsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def collection_params
- params.require(:collection).permit(:name, :privacy, learning_objects: [])
+ params.require(:collection).permit(:name, :description, learning_objects: [])
end
end
diff --git a/app/controllers/management/statistics_controller.rb b/app/controllers/management/statistics_controller.rb
index 2ad8a384063cf2a6a743f15c3b32cead63baee28..9681d7966d07cb57c0a8860ace3b0cc102028aa7 100644
--- a/app/controllers/management/statistics_controller.rb
+++ b/app/controllers/management/statistics_controller.rb
@@ -1,110 +1,11 @@
class Management::StatisticsController < ManagementController
def index
- g = Gruff::Line.new
- g.title = "Usuários"
- g.data 'Estudantes', [0, 5, 8, 20]
- g.data 'Professores', [0, 14,20, 40]
- g.labels={
- 0 => '1',
- 1 => '3',
- 2 => '5',
- 3 => '7',
- 4 => '9'
- }
- g.theme = {
- :colors => ['black', 'grey'],
- :marker_color => 'grey',
- :font_color => 'black',
- :background_colors => 'transparent'
- }
- g.replace_colors(['green','yellow','black'])
- g.marker_count = 1
- g = Gruff::Line.new
- g.title = "Downloads"
- g.data 'downloads', [0, 5, 8, 20]
- g.labels={
- 0 => '1',
- 1 => '3',
- 2 => '5',
- 3 => '7',
- 4 => '9'
- }
- g.theme = {
- :colors => ['black', 'grey'],
- :marker_color => 'grey',
- :font_color => 'black',
- :background_colors => 'transparent'
- }
- g.replace_colors(['green','yellow','black'])
- g.marker_count = 1
-
- g = Gruff::Line.new
- g.title = "Coleções"
- g.data 'colections', [0, 55, 153, 220]
- g.labels={
- 0 => '1',
- 1 => '3',
- 2 => '5',
- 3 => '7',
- 4 => '9'
- }
- g.theme = {
- :colors => ['black', 'grey'],
- :marker_color => 'grey',
- :font_color => 'black',
- :background_colors => 'transparent'
- }
- g.replace_colors(['green','yellow','black'])
- g.marker_count = 1
-
- g.write("/home/alexandre/projetos/portalmec/app/assets/images/geral_colections.png")
-
-
- g = Gruff::Line.new
- g.title = "Acessos"
- g.data 'accesses', [0, 415, 388, 320, 577 ]
- g.labels={
- 0 => '1',
- 1 => '3',
- 2 => '5',
- 3 => '7',
- 4 => '9'
- }
- g.theme = {
- :colors => ['black', 'grey'],
- :marker_color => 'grey',
- :font_color => 'black',
- :background_colors => 'transparent'
- }
- g.replace_colors(['green','yellow','black'])
- g.marker_count = 1
-
- g.write("/home/alexandre/projetos/portalmec/app/assets/images/geral_accesses.png")
end
def usuarios
- g = Gruff::Bar.new
- g.title = "Usuários"
- g.data 'Estudantes', 20
- g.data 'Professores', 40
- g.data 'Curadores', 6
- g.data 'Moderadores', 3
- g.data 'Administradores', 1
-
-
- g.labels={
-
- }
- g.theme = {
- :colors => ['black', 'grey'],
- :marker_color => 'grey',
- :font_color => 'black',
- :background_colors => 'transparent'
- }
- g.replace_colors(['green','yellow','black','purple', 'blue'])
- g.marker_count = 1
+
end
def downloads
@@ -119,30 +20,6 @@ class Management::StatisticsController < ManagementController
def collections
- g = Gruff::Pie.new
- g.title = "Por área de atuação"
- g.data 'Filosofia', 45
- g.data 'Matemática', 92
- g.data 'LÃngua Portuguesa', 78
- g.data 'História', 57
- g.data 'FÃsica', 43
- g.data 'Sociologia', 40
- g.data 'Artes', 3
-
- g.labels={
-
- }
- g.theme = {
- :colors => ['black', 'grey'],
- :marker_color => 'grey',
- :font_color => 'black',
- :background_colors => 'transparent'
- }
- g.replace_colors(['green','yellow','black','purple', 'blue', 'brown', 'red'])
- g.marker_count = 1
-
- g.write("/home/alexandre/projetos/portalmec/app/assets/images/colections.png")
-
end
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d6a66a33b764e42845f8489e674d9e842d7fa72a..4adae6c92a280b206288e2fe62e70ac8f85d19ec 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,15 +1,29 @@
class UsersController < ApplicationController
+
before_action :authenticate_user!, only: :me
before_action :check_current_user_page, only: :show
before_action :set_user, only: :show
def show
@objects = learning_object_repository.all_from_offset_to_limit 0, 10
+ @new_collection = Collection.new
end
def me
@objects = learning_object_repository.all_from_offset_to_limit 0, 10
@new_collection = Collection.new
+ @new_collection.name = 'Favoritos'
+
+ @groups = [
+ CollectionsGroup.new(title: 'Coleções Automáticas',
+ collections: [
+ @new_collection
+ ]),
+ CollectionsGroup.new(title: 'Coleções adicionadas',
+ collections: [
+ @new_collection
+ ])
+ ]
end
@@ -26,4 +40,5 @@ class UsersController < ApplicationController
end
end
end
+
end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index fe3ed8bfe169d3978c056b92761cc29e7478fbf7..de80bcb1437b314e942ef3ed91978a885de071d1 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -11,6 +11,8 @@ class WelcomeController < ApplicationController
learning_object_repository.find(id)
end
+ @General = @General.take(3)
+
@Subjects = subject_repository.all
@Subjects.delete_if{|s| not s.highlights.present?}
@Subjects = @Subjects.take(8)
diff --git a/app/helpers/learning_objects_helper.rb b/app/helpers/learning_objects_helper.rb
index 48405d335781af8c4adb76078d41bca0960f46ee..d43dfacf1f54493a7542d792303a22daffdae49b 100644
--- a/app/helpers/learning_objects_helper.rb
+++ b/app/helpers/learning_objects_helper.rb
@@ -5,14 +5,14 @@ module LearningObjectsHelper
end
def learning_object_thumbnail(learning_object, size = "")
- if learning_object.thumbnail.nil? || learning_object.thumbnail == "thumbnai" # TODO: remove "thumbnai" when possible
+ if learning_object.thumbnail.nil?
if size == "large"
- image_tag('learning-object-preview-large.png')
+ image_tag 'learning-object-preview-large.png', class: "thumbnail"
else
- image_tag('learning-object-preview.png')
+ image_tag 'learning-object-preview.png', class: "thumbnail"
end
else
- image_tag learning_object.thumbnail, alt: learning_object_title(learning_object)
+ image_tag learning_object.thumbnail, alt: learning_object_title(learning_object), class: "thumbnail"
end
end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000000000000000000000000000000000000..06db194510d3b9dc04791b2d7eecd5c01437a271
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,7 @@
+module UsersHelper
+
+ def current_user_page?(user)
+ current_user.id == user.id
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/collections_group.rb b/app/models/collections_group.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6922e70632ff0ff779968cef0ebd8ec27bd61c7f
--- /dev/null
+++ b/app/models/collections_group.rb
@@ -0,0 +1,9 @@
+class CollectionsGroup
+ attr_accessor :title, :collections
+
+ def initialize(params={})
+ @title = params[:title] || nil
+ @collections = params[:collections] || []
+ end
+
+end
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index 70cb8ccf6231ac51aa197ef0ccb77b54d337c7ba..b0c27500ddb7453022f9c3fc6060bc99d1bbf455 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -38,6 +38,7 @@ class LearningObject
values
end
+
def get_bitstream_retrievelink_of name
values = @bitstreams.select { |v| v["bundleName"] == name }
unless values.empty?
@@ -60,6 +61,7 @@ class LearningObject
get_bitstream_filename_of "ORIGINAL"
end
+
private
def defaults
diff --git a/app/models/subject.rb b/app/models/subject.rb
index 4aa1d1c169fd5cc3836a341159864376e60bd7e6..78f8f4cebec2cf62d315f5bbe7889c2c7ed904cb 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -1,12 +1,16 @@
class Subject
include ActiveModel::Model
- attr_accessor :id, :created_at, :description, :highlights, :name
+ attr_accessor :id, :created_at, :description, :highlights, :name, :learning_objects
def highlights
@highlights ||= subject_repository.get_highlights(self)
end
+ def learning_objects
+ @learning_objects ||= subject_repository.get_learning_objects(self)
+ end
+
def subject_repository
Portalmec::Application.repository.for :subject
end
-end
\ No newline at end of file
+end
diff --git a/app/repositories/orient_db/base.rb b/app/repositories/orient_db/base.rb
index 32daef9c18a70471f67a95d4da6ee2657dce1148..9d469e05bd5bd1110a3ef54c41f36c1f52f9d5ed 100644
--- a/app/repositories/orient_db/base.rb
+++ b/app/repositories/orient_db/base.rb
@@ -14,13 +14,16 @@ class OrientDb::Base
build_object result
end
+
def all
objects_hash = connection.query "SELECT FROM #{odb_class}", :limit => -1
objects = build_objects(objects_hash) || []
end
def all_from_offset_to_limit(offset, limit)
+
objects_hash = connection.query "SELECT FROM #{odb_class} LIMIT #{limit} SKIP #{offset}", :limit => limit
+
objects = build_objects(objects_hash) || []
end
diff --git a/app/repositories/orient_db/learning_object_repository.rb b/app/repositories/orient_db/learning_object_repository.rb
index ef7e1796576039d77b1af96e4c2ba4ad8826af18..ad6b2fa816bd819627c771ce863878066ec24ae8 100644
--- a/app/repositories/orient_db/learning_object_repository.rb
+++ b/app/repositories/orient_db/learning_object_repository.rb
@@ -15,6 +15,16 @@ module OrientDb
create_edge "Likes", user.rid, learning_object.id
end
+ # Example:
+ # list = repository.for(:learning_objects).all
+ # list.each do |learning_object|
+ # learning_object.inspect <LearningObject model>
+ # end
+ def all
+ learning_objects_hash = connection.query "SELECT FROM LearningObject"
+ build_objects(learning_objects_hash) || []
+ end
+
# Usage:
# learning_object = repository.for(:learning_objects).get_by_dspace_id 123
#
diff --git a/app/repositories/orient_db/main_page_repository.rb b/app/repositories/orient_db/main_page_repository.rb
index ab8e0b6cb28dae44779c4df32eab1ffc03ab45c1..31e51a02ace50fad43e8c928dad1065fe2ac61a0 100644
--- a/app/repositories/orient_db/main_page_repository.rb
+++ b/app/repositories/orient_db/main_page_repository.rb
@@ -20,10 +20,10 @@ module OrientDb
return nil
end
- #def update(id,operation,atributte,new)
- # puts "update #{id} #{operation} #{atributte} = #{new}"
- # connection.command "update #{id} #{operation} #{atributte} = #{new}"
- #end
+ def update(id,operation,atributte,new)
+ puts "update #{id} #{operation} #{atributte} = #{new}"
+ connection.command "update #{id} #{operation} #{atributte} = #{new}"
+ end
private
diff --git a/app/repositories/orient_db/subject_repository.rb b/app/repositories/orient_db/subject_repository.rb
index 6bc3f7147c2b06155971e59c8b457e43f7bdad45..10acdbd9e3b041864aa4a811c360748965000282 100644
--- a/app/repositories/orient_db/subject_repository.rb
+++ b/app/repositories/orient_db/subject_repository.rb
@@ -12,10 +12,10 @@ module OrientDb
connection.command "DELETE VERTEX Subject where @rid = '#{id}'"
end
- #def update(id, operation, atributte, new_value)
- # puts "update #{id} #{operation} #{atributte} = #{new_value}"
- # connection.command "update #{id} #{operation} #{atributte} = #{new_value}"
- #end
+ def update(id, operation, atributte, new_value)
+ puts "update #{id} #{operation} #{atributte} = #{new_value}"
+ connection.command "update #{id} #{operation} #{atributte} = #{new_value}"
+ end
def get_learning_objects(subject)
result = get_edges_end("IsAbout", "in", subject.id)
diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb
index 0688d28bd7fde662a155ec4953731a16b17c2685..0de015f4dc76322b4a5df53f1bdc2cdb251e5d28 100644
--- a/app/views/collections/_collection.html.erb
+++ b/app/views/collections/_collection.html.erb
@@ -1,5 +1,2 @@
-<div class="row collections">
- <h2><%= collection.title %></h2>
-
- <p><%= collection_length collection %></p>
-</div>
\ No newline at end of file
+<%= image_tag 'icons/collection', width: 24 %>
+<%= collection.name %>
\ No newline at end of file
diff --git a/app/views/collections/_create.html.erb b/app/views/collections/_create.html.erb
index f4e4af8be27c0fada134733a18a70a19e7302d5b..ea3f2ed2fcf67c6b040f25f0ba0b6d211fd0e891 100644
--- a/app/views/collections/_create.html.erb
+++ b/app/views/collections/_create.html.erb
@@ -1,9 +1,11 @@
-<button id="create_collection_popover" type="button" class="btn btn-primary">Criar coleção</button>
+<button data-placement="<%= placement %>" id="create_collection_popover" type="button" class="btn btn-primary">Criar coleção</button>
<div id="create_collection_popover_content" style="display: none">
+
<%= render 'collections/form', collection: collection %>
+
</div>
<div id="create_collection_popover_title" style="display: none">
Criar coleção
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/collections/_form.html.erb b/app/views/collections/_form.html.erb
index 24f267d475e01d8fa457ec048c4ce90324b1a847..f30b462590084f78536a2cce0836dbd693c5ba6a 100644
--- a/app/views/collections/_form.html.erb
+++ b/app/views/collections/_form.html.erb
@@ -1,3 +1,4 @@
+
<%= form_for collection do |f| %>
<%= f.label :name %>
@@ -6,5 +7,6 @@
<%= f.label :description %>
<%= f.text_area :description, required: true, style: 'width: 250px;' %>
+
<%= f.submit %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/collections/_group.html.erb b/app/views/collections/_group.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..0b3af44a684bc00e080136588e1fa5102174c9d9
--- /dev/null
+++ b/app/views/collections/_group.html.erb
@@ -0,0 +1,11 @@
+<div class="row" style="margin-bottom: 40px;">
+ <div class="col-md-12">
+ <h3><%= title %></h3>
+
+ <div style="margin-top: 10px;">
+ <% collections.each do |collection| %>
+ <%= render collection %>
+ <% end %>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index c224d3447d983e5f37cb4f4649b8aeb531ff483a..5048a44326d5f295b9feb63564d6cca2efc61694 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -1 +1,32 @@
-<h1><%= @collection.name %></h1>
+<div class="row">
+ <%= render 'users/header', user: @user %>
+
+ <div class="user-files">
+ <div class="row user-page-subtitle">
+ <div class="col-md-6">
+ <div class="media">
+ <div class="media-body">
+ <h2 class="media-heading">Objetos do usuário</h2>
+ <h4>x items</h4>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 right-column align-right">
+ <% if current_user_page? user %>
+ <button type="button" class="btn btn-primary">Adicionar novo objeto</button>
+ <% end %>
+ </div>
+ </div>
+
+ <div class="row learning-object-columns">
+ <%= render @objects[0], orientation: "vertical" %>
+ <%= render @objects[1], orientation: "vertical" %>
+ <%= render @objects[2], orientation: "vertical" %>
+ <%= render @objects[0], orientation: "vertical" %>
+ <%= render @objects[1], orientation: "vertical" %>
+ <%= render @objects[2], orientation: "vertical" %>
+ </div>
+
+ <div style="clear: both;"></div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index f67db65b8b4ba004f64cfe6faaff987c4cf0060d..bd68632dc68309badc1558a93fc2117eac7cda5e 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -10,7 +10,7 @@
<div class="field">
<%= f.label :email %><br/>
- <%= f.email_field :email, required: true %>
+ <%= f.email_field :email, :value => params[:email], required: true %>
</div>
<div class="field">
diff --git a/app/views/learning_objects/_add_to_collection_btn.html.erb b/app/views/learning_objects/_add_to_collection_btn.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..1a51fc019d59cc3dbf46e704bf3a2c3bcbda3feb
--- /dev/null
+++ b/app/views/learning_objects/_add_to_collection_btn.html.erb
@@ -0,0 +1,13 @@
+<a href="#" id="add_to_collection">Adicionar as coleções</a>
+
+<div id="collections_list_popover" style="display: none">
+ <ul>
+ <% collections.each do |c| %>
+ <li><%= c.name %></li>
+ <% end %>
+ </ul>
+</div>
+
+<div id="collections_list_popover_title" style="display: none">
+ Adicione esse objeto a uma coleção
+</div>
\ No newline at end of file
diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb
index 504d5190d3011f9d9503724c15edb159b87c8e7f..ab1cb73e934fabb161d5d2ab431878d2a3b1d7da 100644
--- a/app/views/learning_objects/_learning_object_horizontal.erb
+++ b/app/views/learning_objects/_learning_object_horizontal.erb
@@ -1,7 +1,7 @@
<% link = learning_object_path(id: learning_object.id) %>
<div class="learning-object-horizontal">
<div class="media">
- <div class="media-left media-middle">
+ <div class="media-left media-top">
<div class="learning-object-thumbnail">
<%= link_to link do
learning_object_thumbnail learning_object
@@ -14,19 +14,21 @@
</div>
<div class="media-body">
+
<%= link_to link do %>
- <h4><%= learning_object_title learning_object %></h4>
+ <h4 class="media-heading"><%= learning_object_title learning_object %></h4>
<% end %>
- <span>Por <%= link_to 'João', '#' %></span><br/>
+ <span class="author-label">Por <%= learning_object.get_metadata_value_of("dc.contributor.author") %></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/>
<% end %>
<br/>
- <b><%= ("Em " + show_categories(learning_object.categories)) unless learning_object.categories.nil? %></b>
+ <b><%#= ("Em " + show_categories(learning_object.categories)) unless learning_object.categories.nil? %></b>
</div>
</div>
</div>
diff --git a/app/views/learning_objects/_learning_object_vertical.erb b/app/views/learning_objects/_learning_object_vertical.erb
index 2ebbc5ee9fadf0926e1fabe282d9ee32054cde98..6084b3a027e37116e74e3dafe1c96946996e5b80 100644
--- a/app/views/learning_objects/_learning_object_vertical.erb
+++ b/app/views/learning_objects/_learning_object_vertical.erb
@@ -9,10 +9,10 @@
<% end %>
</div>
<div class="panel-body">
- <h4 class="media-heading"><%= learning_object_title(learning_object) %></h4>
+ <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>
+ <span class="author-label">Por <%= learning_object.get_metadata_value_of("dc.contributor.author") %></span>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/management/carousels/edit.html.erb b/app/views/management/carousels/edit.html.erb
index 40381273a38d67c2d1aedb64c2a22b9951ae68ef..f4fbf007c6561345b05e782ffd7b72154ea73bc0 100644
--- a/app/views/management/carousels/edit.html.erb
+++ b/app/views/management/carousels/edit.html.erb
@@ -1,7 +1,9 @@
+
<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
<ol class="ls-breadcrumb">
<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 9b794145170bb7ddf7b8e5dca87acc0d1301f954..6ea5335f18d6e18d5b0350be8931569ae2f69771 100644
--- a/app/views/management/carousels/index.html.erb
+++ b/app/views/management/carousels/index.html.erb
@@ -1,5 +1,7 @@
+
<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>
<table class="ls-table">
diff --git a/app/views/management/carousels/new.html.erb b/app/views/management/carousels/new.html.erb
index f7a51f48a7c69b3a276a616c5a04c82380e35aa5..23ab3e1cca473ef4c66e7ac22f4b3b74ed3b770e 100644
--- a/app/views/management/carousels/new.html.erb
+++ b/app/views/management/carousels/new.html.erb
@@ -1,3 +1,4 @@
+
<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
<ol class="ls-breadcrumb">
diff --git a/app/views/management/statistics/accesses.html.erb b/app/views/management/statistics/accesses.html.erb
index 27cd251261e1e326db5993dd9651c7a4ff954653..24f59d864c6fb3dcb903bf749b55e50636a8342d 100644
--- a/app/views/management/statistics/accesses.html.erb
+++ b/app/views/management/statistics/accesses.html.erb
@@ -1,8 +1,6 @@
-<script src="/home/alexandre/.rvm/gems/ruby-2.1.5/gems/chart-js-rails-0.0.9/vendor/assets/javascripts/Chart.js"></script>
-
<ol class="ls-breadcrumb">
<li><%= link_to "InÃcio", management_root_path %></li>
- <li><%= link_to "EstatÃsticas", management_statistics_index_path %></li>
+ <li><%= link_to "EstatÃsticas", management_statistics_path %></li>
<li> Acessos </li>
</ol>
<br><br>
diff --git a/app/views/management/statistics/collections.html.erb b/app/views/management/statistics/collections.html.erb
index 75c45c00c17b2b1a50eef4b1579a107e2cddcb0b..0da808d5194434ad0e7d93f9d1709fae529f9286 100644
--- a/app/views/management/statistics/collections.html.erb
+++ b/app/views/management/statistics/collections.html.erb
@@ -1,9 +1,6 @@
-<script src="/home/alexandre/.rvm/gems/ruby-2.1.5/gems/chart-js-rails-0.0.9/vendor/assets/javascripts/Chart.js"></script>
-
-
<ol class="ls-breadcrumb">
<li><%= link_to "InÃcio", management_root_path %></li>
- <li><%= link_to "EstatÃsticas", management_statistics_index_path %></li>
+ <li><%= link_to "EstatÃsticas", management_statistics_path %></li>
<li> Coleções </li>
</ol>
diff --git a/app/views/management/statistics/downloads.html.erb b/app/views/management/statistics/downloads.html.erb
index f87a442941927097183d02735b82a02dd865d394..59a8bd26d09d52ed4b4b1c62238f436a23c4782d 100644
--- a/app/views/management/statistics/downloads.html.erb
+++ b/app/views/management/statistics/downloads.html.erb
@@ -1,7 +1,6 @@
-<script src="/home/alexandre/.rvm/gems/ruby-2.1.5/gems/chart-js-rails-0.0.9/vendor/assets/javascripts/Chart.js"></script>
<ol class="ls-breadcrumb">
<li><%= link_to "InÃcio", management_root_path %></li>
- <li><%= link_to "EstatÃsticas", management_statistics_index_path %></li>
+ <li><%= link_to "EstatÃsticas", management_statistics_path %></li>
<li> Downloads </li>
</ol>
<br><br>
diff --git a/app/views/management/statistics/index.html.erb b/app/views/management/statistics/index.html.erb
index a12ec089d66ee78503727f1c74c4bb1f31c5bd24..fb8d9e581c4b783df3de7b01d8655b8207b3aeb5 100644
--- a/app/views/management/statistics/index.html.erb
+++ b/app/views/management/statistics/index.html.erb
@@ -19,21 +19,21 @@
<h6 class="ls-title-4">Total de usuários</h6>
<strong class="ls-color-theme">60</strong>
<!--<small>envios por mês</small>-->
- <%= link_to "Mais detalhes" , management_statistics_users_path, class: "ls-btn ls-btn-sm" %>
+ <%= link_to "Mais detalhes" , users_management_statistics_path, class: "ls-btn ls-btn-sm" %>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="ls-box">
<h6 class="ls-title-4">Total de coleções</h6>
<strong class="ls-color-theme">348</strong>
- <%= link_to "Mais detalhes" , management_statistics_colections_path, class: "ls-btn ls-btn-sm" %>
+ <%= link_to "Mais detalhes" , collections_management_statistics_path, class: "ls-btn ls-btn-sm" %>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="ls-box">
<h6 class="ls-title-4">Total de downloads</h6>
<strong class="ls-color-theme">340</strong>
- <%= link_to "Mais detalhes" , management_statistics_downloads_path, class: "ls-btn ls-btn-sm" %>
+ <%= link_to "Mais detalhes" , downloads_management_statistics_path, class: "ls-btn ls-btn-sm" %>
</div>
</div>
<div class="col-sm-6 col-md-3">
@@ -41,28 +41,8 @@
<h6 class="ls-title-4 ">Total de acessos</h6>
<strong class="ls-color-theme">2091</strong>
- <%= link_to "Mais detalhes" , management_statistics_accesses_path, class: "ls-btn ls-btn-sm" %>
+ <%= link_to "Mais detalhes" , accesses_management_statistics_path, class: "ls-btn ls-btn-sm" %>
</div>
</div>
</div>
</div>
-
-<div position="relative", style="margin-left:10px">
-<div style="float: left" >
- <%= image_tag("geral_user.png", height:"220", :alt => "Image missing") %>
-
-</div>
-
-<div style="float: left; margin-left:30px">
- <%= image_tag("geral_colections.png", height:"220", :alt => "Image missing") %>
-</div>
-
-
-<div style="float: left; margin-left:30px">
- <%= image_tag("geral_download.png", height:"220", :alt => "Image missing") %>
-</div>
-
-<div style="float: left;margin-left:40px">
- <%= image_tag("geral_accesses.png", height:"220", :alt => "Image missing") %>
-</div>
-</div>
diff --git a/app/views/management/statistics/users.html.erb b/app/views/management/statistics/users.html.erb
index 4046d9dd26a395a075b181644482eab68b1357f7..237fd288d86516e4dcb0e487d270c6ef1034a235 100644
--- a/app/views/management/statistics/users.html.erb
+++ b/app/views/management/statistics/users.html.erb
@@ -1,9 +1,6 @@
-
-<script src="/home/alexandre/.rvm/gems/ruby-2.1.5/gems/chart-js-rails-0.0.9/vendor/assets/javascripts/Chart.js"></script>
-
<ol class="ls-breadcrumb">
<li><%= link_to "InÃcio", management_root_path %></li>
- <li><%= link_to "EstatÃsticas", management_statistics_index_path %></li>
+ <li><%= link_to "EstatÃsticas", management_statistics_path %></li>
<li> Usuários </li>
</ol>
diff --git a/app/views/users/_header.html.erb b/app/views/users/_header.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..6e5e111e9cec1bb34ce7338353b3f06486320a1d
--- /dev/null
+++ b/app/views/users/_header.html.erb
@@ -0,0 +1,48 @@
+<div class="user-header">
+ <div class="col-md-6">
+ <div class="media">
+ <div class="media-left">
+ <% if current_user.id == user.id %>
+ <%= link_to edit_user_registration_path do
+ image_tag user.avatar.url(:thumb), class: 'user-image'
+ end %>
+ <% else %>
+ <%= image_tag user.avatar.url(:thumb), class: 'user-image' %>
+ <% end %>
+ </a>
+ </div>
+ <div class="media-body">
+ <h2 class="media-heading"><%= user.name %></h2>
+
+ <h3 class="header-sub">Universidade Federal do Paraná - UFPR</h3>
+
+ <div class="header-content">
+ <a href="#" class="showmore">
+ <span>ver mais</span>
+ <span style="display: none;">fechar</span>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 right-column">
+ <% if current_user_page? user %>
+ <button type="button" class="btn btn-default">Editar perfil</button>
+ <% else %>
+ <button type="button" class="btn btn-default">Seguir</button>
+ <% end %>
+
+
+ <div class="col-md-12 user-biography">
+ <h3>Biografia</h3>
+
+ <p>asdasdsadasdas</p>
+ <a href="#" class="showmore">
+ <span style="display: none;">fechar</span>
+ <span>fechar</span>
+ </a>
+ </div>
+
+ <div style="clear: both;"></div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/me.html.erb b/app/views/users/me.html.erb
index 7596496a6e00778da71e85369c896ff21d880468..f3eaf7210f012eafdee60ca2c3f5cf0557eb9f99 100644
--- a/app/views/users/me.html.erb
+++ b/app/views/users/me.html.erb
@@ -1,46 +1,8 @@
<div class="row">
- <div class="user-header">
- <div class="col-md-6">
- <div class="media">
- <div class="media-left">
- <%= link_to edit_user_registration_path do
- image_tag current_user.avatar.url(:thumb), class: 'user-image'
- end %>
- </a>
- </div>
- <div class="media-body">
- <h2 class="media-heading"><%= current_user.name %></h2>
-
- <h3 class="header-sub">Universidade Federal do Paraná - UFPR</h3>
-
- <div class="header-content">
- <a href="#" class="showmore">
- <span>ver mais</span>
- <span style="display: none;">fechar</span>
- </a>
- </div>
- </div>
- </div>
- </div>
- <div class="col-md-6 right-column">
- <button type="button" class="btn btn-default" onclick="window.location=<%= edit_user_registration_path %>">Editar perfil</button>
- </div>
-
- <div class="col-md-12 user-biography">
- <h3>Biografia</h3>
-
- <p>asdasdsadasdas</p>
- <a href="#" class="showmore">
- <span style="display: none;">fechar</span>
- <span>fechar</span>
- </a>
- </div>
-
- <div style="clear: both;"></div>
- </div>
+ <%= render 'users/header', user: current_user %>
<div class="user-files">
- <div class="row">
+ <div class="row user-page-subtitle"">
<div class="col-md-6">
<div class="media">
<div class="media-body">
@@ -70,7 +32,7 @@
</div>
<div class="user-files">
- <div class="row">
+ <div class="row user-page-subtitle">
<div class="col-md-6">
<div class="media">
<div class="media-body">
@@ -79,17 +41,13 @@
</div>
</div>
<div class="col-md-6 right-column align-right">
- <%= render 'collections/create', collection: @new_collection %>
+ <%= render 'collections/create', collection: @new_collection, placement: 'left' %>
</div>
</div>
- <div class="row learning-object-columns">
- <%= render @objects[0], orientation: "vertical" %>
- <%= render @objects[1], orientation: "vertical" %>
- <%= render @objects[2], orientation: "vertical" %>
- <%= render @objects[0], orientation: "vertical" %>
- <%= render @objects[1], orientation: "vertical" %>
- <%= render @objects[2], orientation: "vertical" %>
- </div>
+ <% @groups.each do |group| %>
+ <%= render 'collections/group', title: group.title, collections: group.collections %>
+ <% end %>
+
</div>
</div>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e15a354e1d7f700f88622a1fad07b19c7667b6e5..94a42701e051fa741bd6d4ba3915dbb203b137b0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,54 +1,22 @@
<div class="row">
- <div class="user-header">
- <div class="col-md-6">
- <div class="media">
- <div class="media-left">
- <a href="#">
- <img class="user-image" src="<%= image_path("user-anon.png") %>" alt="Foto do usuário">
- </a>
- </div>
- <div class="media-body">
- <h2 class="media-heading">Usuário</h2>
- <h3 class="header-sub">nome da instituição</h3>
- <div class="header-content">
- <a href="#" class="showmore">
- <span>ver mais</span>
- <span style="display: none;">fechar</span>
- </a>
- </div>
- </div>
- </div>
- </div>
- <div class="col-md-6 right-column">
- <button type="button" class="btn btn-default">Seguir</button>
- </div>
-
- <div class="col-md-12 user-biography">
- <h3>Biografia</h3>
-
- <p>asdasdsadasdas</p>
-
- <a href="#" class="showmore">
- <span style="display: none;">fechar</span>
- <span>fechar</span>
- </a>
- </div>
-
- <div style="clear: both;"></div>
- </div>
+ <%= render 'users/header', user: @user %>
<div class="user-files">
<div class="row">
<div class="col-md-6">
<div class="media">
<div class="media-body">
+
<h2 class="media-heading">Objetos do usuário</h2>
<h4>x items</h4>
+
</div>
</div>
</div>
<div class="col-md-6 right-column align-right">
- <button type="button" class="btn btn-primary">Enviar mensagem</button>
+ <% if !current_user_page? @user %>
+ <button type="button" class="btn btn-primary">Enviar mensagem</button>
+ <% end %>
</div>
</div>
@@ -61,6 +29,7 @@
<%= render @objects[2], orientation: "vertical" %>
</div>
+
<div style="clear: both;"></div>
<div style="float: right;">
<a href="#">Ver todos</a>
@@ -68,26 +37,25 @@
</div>
<div class="user-files">
- <div class="row">
+ <div class="row user-page-subtitle">
<div class="col-md-6">
<div class="media">
<div class="media-body">
- <h2 class="media-heading">Minhas Coleções</h2>
+ <h2 class="media-heading">Coleções do usuário</h2>
</div>
</div>
</div>
<div class="col-md-6 right-column align-right">
-
+ <% if current_user_page? @user %>
+ <%= render 'collections/create', collection: @new_collection, placement: 'left' %>
+ <% end %>
</div>
</div>
- <div class="row learning-object-columns">
- <%= render @objects[0], orientation: "vertical" %>
- <%= render @objects[1], orientation: "vertical" %>
- <%= render @objects[2], orientation: "vertical" %>
- <%= render @objects[0], orientation: "vertical" %>
- <%= render @objects[1], orientation: "vertical" %>
- <%= render @objects[2], orientation: "vertical" %>
- </div>
+ <% @groups.each do |group| %>
+ <%= render 'collections/group', title: group.title, collections: group.collections %>
+ <% end %>
+
</div>
-</div>
\ No newline at end of file
+
+</div>
diff --git a/app/views/welcome/contact.html.erb b/app/views/welcome/contact.html.erb
index 7f16f8d88c0bae54cab0cb26910e199d76e342b7..38e9966acb31c1af7d2595195481a644af11eb9f 100644
--- a/app/views/welcome/contact.html.erb
+++ b/app/views/welcome/contact.html.erb
@@ -35,7 +35,7 @@
</div>
<div class="col-md-3">
<p class="font_roboto_light">
- Telefone: (01)2345-6789
+ Telefone: (41)3361-3567
</p>
</div>
</div>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index c8334c8b709ee24b8d890c4efd646abb9e59a42e..dd2b562bbe8b114bf37861c0060e6bba9a7e3bfe 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -46,7 +46,22 @@
</div>
</div>
<div class="col-md-3 col-md-offset-1 hidden-xs hidden-sm">
- <img src="http://dummyimage.com/350x500/363336/fff" style="margin-top: 30px;" alt='dummy image'>
+ <div class="panel-wrapper">
+ <div style="padding: 30px; min-height: 400px">
+ <h2>Cadastre-se!</h2><br>
+ <h2>Vantagens de cadastrar:</h2><br>
+ <h2>Tem Muitas!</h2><br>
+ <h2>Tem Muitas!</h2><br>
+ <h2>Tem Muitas!</h2><br>
+ <h2>Tem Muitas!</h2><br>
+ </div>
+ <div style="width: 100%; padding: 30px;">
+ <%= form_tag(new_user_registration_path, method: 'get') do %>
+ <%= text_field_tag :email, '', placeholder: "Seu email", class: 'form-control'%>
+ <%= button_to "Cadastrar-se", new_user_registration_path,class: "btn btn-danger", style: 'margin-top: 10px; width: 230px; background-color: #FF2134;'%>
+ <% end %>
+ </div>
+ </div>
</div>
</div>
diff --git a/config/routes.rb b/config/routes.rb
index 7d6076052f265800df0cff91bf4dc9831c8bf1b3..c6a3fd5e87eceac3a43b311eaad7c568433ea6a8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,11 +19,17 @@ Rails.application.routes.draw do
end
end
+ get 'highlights/new' => 'highlights#new', as: 'new_highlights'
+ get 'highlights/delete' => 'highlights#delete', as: 'delete_highlights'
+ get 'highlights/index' => 'highlights#index', as: 'index_highlights'
resources :users
+
resources :highlights
+
resources :carousels
mount Sidekiq::Web, at: '/sidekiq'
+
end
root 'welcome#index'