diff --git a/app/assets/images/icons/collection1.png b/app/assets/images/icons/collection1.png
new file mode 100644
index 0000000000000000000000000000000000000000..078a493a9d8ff6b0ebe344fd3d8c2ba8f0728e9d
Binary files /dev/null and b/app/assets/images/icons/collection1.png differ
diff --git a/app/assets/images/icons/square.png b/app/assets/images/icons/square.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a344b9ffb5dbac0733e36912b632d4ba804f2ad
Binary files /dev/null and b/app/assets/images/icons/square.png differ
diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js
index ccf9bf19d494131a5fbf278a52ccb2e963e9c965..f16b49fac5fb2606cdf31a882af9c11caf8de947 100644
--- a/app/assets/javascripts/application/accessibility.js
+++ b/app/assets/javascripts/application/accessibility.js
@@ -57,7 +57,12 @@ var contrast = function() {
// init
$(document).ready(function() {
+ // $("select-tag-container").select2();
run();
+ var $select2 = $('select.select-tag-container').select2();
+ $select2.data('select2').$container.addClass("selec");
+
+
});
function run() {
@@ -72,6 +77,13 @@ var contrast = function() {
$(contrast_elements).addClass('contraste');
$('.search-bar').css('border-top','2px solid white');
$('#menu-bar').addClass('menu-bar-contrast');
+
+ // var $select2 = $('select.select-tag-container').select2();
+ // var $select1 = $('select.select-tag-container').select2();
+ // $select2.data('select2').$container.addClass("selec");
+ // $select1.data('select2').$dropdown.addClass("words");
+ // $select2.data('select2').$results.addClass("fundo");
+
}
}
diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js
index ed6954101b77e8467e0340a47d99004749a9acd4..1eec202962b47f836abad610d15b546f959d42e4 100644
--- a/app/assets/javascripts/application/search.js
+++ b/app/assets/javascripts/application/search.js
@@ -1,5 +1,20 @@
$(document).ready(function () {
- $(".select-tag-container").select2();
+// $(".select-tag-container").addClass("menu-lef");
+$("select-tag-container").select2();/*
+var $select2 = $('select.select-tag-container').select2();
+var $select1 = $('select.select-tag-container').select2();
+$select2.data('select2').$container.addClass("selec");
+$select1.data('select2').$dropdown.addClass("words");
+$select2.data('select2').$results.addClass("fundo");
+//$select1.data('select2').$select2-dropdown()"selec");
+
+
+//var $select1 = $('select-tag-container').select2();
+//$select1.data('select2').$container.addClass("menuopt");
+
+ //$(".select-tag-container").addClass({containerCssClass: "menu-lef"});
+ //$(".select-tag-container").addClass({containerCssClass: "menu-lef"}).select2();
+ //$(".select-tag-container").select2().addClass('menu-lef');
var runDropdown = function (element) {
if ($(element).next().is(':hidden')) {
@@ -18,3 +33,23 @@ $(document).ready(function () {
runDropdown(this);
});
});
+
+
+
+
+var runDropdown = function (element) {
+ if ($(element).next().is(':hidden')) {
+ $('> .caret', element).addClass('caret-up');
+ $(element).next().slideDown();
+ }
+ else {
+ $('> .caret', element).removeClass('caret-up');
+ $(element).next().slideUp();
+ }
+};
+
+runDropdown($('.nestedAccordion .dropdown'));
+
+$('.nestedAccordion .dropdown').click(function () {
+ runDropdown(this);
+});
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 6ffbf86f8d12bdd6c92fc5e4bea5cef662e75dbc..7aa10ae5d9a4eacd8b744c17aa4122db91be8252 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -328,7 +328,7 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
#subject-highlight{
background-color: black !important;
}
-
+
.field{
input{
color: black !important;
@@ -378,4 +378,14 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
.dropdown-menu{
background-color: black;
}
+
+}
+.words{
+ color:white;
+}
+.selec{
+ color:blue;//white
+}
+.fundo{
+ background: black;
}
diff --git a/app/assets/stylesheets/application/search.scss b/app/assets/stylesheets/application/search.scss
index 71452e6b0119474729e8e70a4b150a3aeea38d6d..6d4a0249a460a8873034473cccb999e60f451b8f 100644
--- a/app/assets/stylesheets/application/search.scss
+++ b/app/assets/stylesheets/application/search.scss
@@ -1,3 +1,4 @@
+
.search-sidebar {
margin-top: 40px;
@@ -5,6 +6,7 @@
width: 95%;
margin-left: 3%;
}
+
}
.nestedAccordion {
@@ -18,6 +20,7 @@
width: 100% !important;
}
+
// #nestedAccordion{
// width:100%;
// }
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 256d4350dff89ac1c10210e0301a57334ac56aea..1bc33be4d4a9965756cd51439f63f82b64c6157e 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -65,4 +65,7 @@ class CollectionsController < ApplicationController
params.require(:collection).permit(:name, :description, learning_objects: [])
end
+ def collection
+ end
+
end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index e215b8d3aebb34f8d8a59ebda184995790fbcd02..22ba9c979085c646afd5da531da9a4a77e0c4c12 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -30,4 +30,7 @@ class WelcomeController < ApplicationController
end
end
+ def Collection
+ end
+
end
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 6e69a709330cfcd40824e067aafad77f996fd964..732f3596e2215beeb9dfc35aafaf5a005f30e988 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,5 +1,5 @@
<div class="row">
- <div class="col-sm-4 search-sidebar">
+ <div class="col-sm-4 search-sidebar" id="menu-left">
<!-- <h2>Busca Avançada</h2> -->
<!-- <div class="media">
<div class="media-left">
@@ -189,7 +189,7 @@
</tr>
</table>
</div>
-
+
<h3 class="dropdown">Ano escolar<span class="caret caret-align-right"/></h3>
<div class="dropdown-element">
diff --git a/app/views/welcome/collection.html.erb b/app/views/welcome/collection.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..28fa4d131c98121a73c425ea9a2bbe64bb95f463
--- /dev/null
+++ b/app/views/welcome/collection.html.erb
@@ -0,0 +1,41 @@
+
+
+<nav class="navigation navbar-default "><br/>
+<div class="container-fluid">
+ <div class="navbar-header">
+ <%= image_tag image_path("icons/collection.png"), class: "logo-image",size: "90x66" %>
+ <ul class="nav navbar-nav navbar-right"><h1> <b>Coleção 1</b></h1> <br/>
+ <%= image_tag image_path("icons/square.png"), class: "logo-image",size: "20x20" %> 200 itens</ul>
+ </div>
+</div>
+<br/></nav>
+<nav class="navigation navbar-inverse ">
+ <div class="container-fluid">
+ <a class="navbar-brand" href="#">x arquivo(s) selecionado(s)</a>
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %> Salvar no computador</a></li>
+ <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %> Copiar para</a></li>
+ <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %> Mover para</a></li>
+ <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %> Remover da coleção</a></li>
+ </ul>
+ </div>
+</nav>
+
+<div class="row mainpage-subjects">
+ <br/>
+ <div class="col-md-4">
+ Obj 1<br/>
+ Obj 4<br/>
+ Obj 7
+ </div>
+ <div class="col-md-4">
+ Obj 2<br/>
+ Obj 5<br/>
+ Obj 8
+ </div>
+ <div class="col-md-4">
+ Obj 3<br/>
+ Obj 6<br/>
+ Obj 9
+ </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 06bc22b7b3213ea6918fa55d2cd228dc25c7b09a..60cac5a8c00482290b1d49adf32b434af11fc16b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -56,5 +56,5 @@ Rails.application.routes.draw do
get '/complaint' => 'welcome#complaint', as: 'complaint'
get '/search' => 'search#index', as: 'search'
get '/subject/:id' => 'welcome#subject', as:'subject_index'
-
+ get '/collection' => 'welcome#collection'
end