From 05eac2c7ebe514975dc64e1ef280bd4c7a2ef939 Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Fri, 11 Mar 2016 10:21:05 -0300
Subject: [PATCH] New action buttons
---
app/assets/images/icons/btn_add.png | Bin 264 -> 193 bytes
app/assets/images/icons/btn_like_down.png | Bin 492 -> 426 bytes
app/assets/images/icons/btn_like_up.png | Bin 465 -> 403 bytes
app/assets/images/icons/btn_report_up.png | Bin 474 -> 262 bytes
.../application/learning_objects.coffee.erb | 2 +-
.../application/learning_objects.scss | 15 +++++++++++++--
.../complaints/_complaints_button.html.erb | 2 +-
app/views/learning_objects/show.html.erb | 11 ++++++-----
8 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/app/assets/images/icons/btn_add.png b/app/assets/images/icons/btn_add.png
index 4b1ead3af9dfea2ddd384c0238c2da9a1810d958..bfb53a0140d0ebe64b50277f61d339837d0fc94f 100644
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1SGcvS$+jloCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#0W&v`oVdtN{(hiPf~SjPh{y5dn(yy)nR6M0na>{BU|w~5+S=ROa#Z7Nxj%Zn
zzqi|5>e^zr{))wt6TSE4MsJ%mOMgP+rb&~g_nY61?UnbLXEL*~QPEt#+@!Tf%C@OD
lO;J<+vX*(Dn{q1ygGr|J{G`th?gH&%@O1TaS?83{1OSfyJ+c4*
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1SGer&Y23NBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%t@3nn45_&FX1XKaAq4?f?mv^S++GpBvRyMgFh6;{!y74&
z`hv?-1<yP<^s_OMRbTkQ;TZx=#bpyhyd+a1UKjZ}@#vl7C^JgxagtbYpiS>r@tMC>
z$*b=zyv5m{dU0=HPtvXvYhF)2d~adp$=mN9c()hY%=5QyKjy!=Qs2J%*h{0@KldE`
zXC;YT{uZ76VUnC)!2j1F;y)g7Y%pUu@<}6<H{x-}Ge<VT*$m7KManjpML#Z41G<{Q
M)78&qol`;+09eaw_W%F@
diff --git a/app/assets/images/icons/btn_like_down.png b/app/assets/images/icons/btn_like_down.png
index f44d9ec01940f06508753d78bdde5f5dfb0925ed..f14fdd3848c88ed1eead5f6da82771e06bc68d11 100644
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq0015U0015c0ssI2v{E_s00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-#m3k)I#4f<As0003=Nkl<ZNXKJ*_wFqNZ2%Jk&A`w!
znuQEKx1WFc^y9CT0K23h2bGOBpL~vifx%CSe?f{qH3Q`K^Dhv_rh6a1{P;snqxau<
z2WQ`W{*`J*fBEsJ^~e*Nq>!q$H$Q)e1_Cc9i@GE?b&NiH|KpOYh^!m0CCtOYLWLAE
zYyYE)-48GYjTQJIY(5TVRY@LXSw`eC<oWv_?c45t`i>Is)!xdgk~~6HhX`7~J5}FU
zksrIO_g{aD>}3eBy73OpIk>>H_dk%0MhWXLKmSsav!zfoC)LUjUQQM%0d|@g?I_7D
zNh4R&uu$dWWTBPO@m4ZJu$JNDV5W)DImY6c*@`+w%Ls82D4u)`#E#v4kETLhoST7x
zVTzCPu4``?7#Q|H|N8kmdga2y&Wvd^BiT)y=kI?!`|uNLy(Bkg0n0erdZL@r0Qeke
Ub<&B4tN;K207*qoM6N<$f&#j`HUIzs
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq001HY001Hg0ssI2wI!UD0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzj!8s8RCwBAeE<GEGcywdEy3Tv|5$)_
zFflRz`}dbdb^r|rk}N<BwByg8KQyw2g#~OG16{!IvWA6howuKV`SjzjlmNS=AO{Vt
zF`s-6Nct)9FG$g+RiFXA0%2^r_wmb*KeV!D|BZKW_RZ&CX<`k~`K?Eu&^)D8t-bmA
zJ2aqpIa$;txv6i>+4~=tTzw1Y#%l@laIjE0rOn#^sABg6OhID>eh8b7gIQIQ2U8>C
zr%xY&6mpsN{QZyiZFfI?M@c``-pWAzLRE(dI%RjNzOf=dQklkr-8cKMzeNrf2(Y^G
z4y!XU!L#>2kgdTPH(!2IR4GVdD-@_)rU4Tku=t_5HI9<pl63G5ohkx8P8NDt6K^Fm
zjA~C{DL`{;a*V}sWnpSsBO}B~Lec4KAa?BTdo)3HaZqVL#YcJ9wKt#w>G{{s-_a{g
z9(HD2)?g_*Ndmxf_SuJ@P^U<8V^#`~qLWf<h-h`PjJ7(-Z*>Cu1}rQz^9Q(B!vgH%
i(9|D5JAhUI1Q-Bsj)|$|wXUH60000<MNUMnLSTaZTGy`t
diff --git a/app/assets/images/icons/btn_like_up.png b/app/assets/images/icons/btn_like_up.png
index 1093e39c3c4e1bda2ce6d0c022bf4d52a8c0efff..b8db3af1ee8117f1c2ccbb1df46b581f57b32e79 100644
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq0015U0015c0ssI2v{E_s00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-#m3k)AE%dY2q0003pNkl<ZNXPA#u};G<5QZ-Za#@@O
zXThD?0muS8K=KgbA@dNF1v(H|GG)UI)KlCJ&Ju@(Ap(-RU5brViJMNA{Mr8f-`U=J
zy#hCJ1kU0x(Z_qtk+syFCWM4xXc?X7IRLN;%d*U-AhMQyB9=mHZ4>>*`Oh*^T0?8C
z%d&Lhko&uN`z1nvNGY|07DBuZ)R@j@h-kqfFU9jyQJ8~g6V~VGBaP@zv{GvE@Yr^v
zdry;;M%3h1RRsVr7|w1p#@Kc==X`kNZ%b@!XIChthUk&jAG-TZWp5OxwH^{65<;Ay
zPb2DT*AAO%;G-+_)y?$*zB1@YkT{Obva*8?$By1o=;xOg?_y~h766ho;hY1&s+O(s
xxSXJGqP@MpI7+FeY5JT}YBpH!|M&D~=ud7{YRREEdwKu>002ovPDHLkV1f_hus8q!
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq001HY001Hg0ssI2wI!UD0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzb4f%&RCwC#moZO-Fcin{pwe4lvA5Wp
zyg_AAKLC6P{E&PIbx{Y=g^5iZyiSK9!U71yCq%^*;)SCO7fEQFCgs=nc>TZEX&8pG
zEKNi{MNuMPNRnKZg&+oe99je~F!DSXgh8l+O-6Zk3xj&E4Aw!KrK+lGnkEoq+cvax
zK`qM?<uov*9<UWl(^M4Z+4p~tK_CPJ+jm`8c%)rlUL{|Snqf=`86LwJdun*>aJj@7
z4;*Qa&cnUq@RJ7%T92`U$((G2iK6K4<~GTG#gA#2u%2glp7+@`rmYK$Qu;T>_x+|@
zzC){Zo2|R#F)jb*J<Yb!l~z$0SkoZzKz@W{_UB{_Yeq^0GX;-<IXyqyq3nrAaGI{`
zT}OCGjMjEyI>qMb<oJcH_yYm0VH$p=L$B)~;gaSaR=P0LD0+jgcR2_O7RPZthQz}s
z1yt38+hR7TI?;dC*}v+9y8%MN?5J)v2<|vS?EnTKJ_Hy5reuimTpW>H00000NkvXX
Hu0mjfEpNxt
diff --git a/app/assets/images/icons/btn_report_up.png b/app/assets/images/icons/btn_report_up.png
index 5bfcd2293be7cc7f051f6305b68e5a7ca96f7878..52c2839e2bbaeba6418c45e99e3d48bb3d7a606f 100644
GIT binary patch
literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)j!3HGjh1XvOQk(@Ik;M!Q+`=Ht$S`Y;1W=H@
z#M9T6{Q)yKkCeu-&Cj<1g_e4{IEHu}e|v2s?_mW2)(iQkg+xOF3=fw291vI|9sW_E
zo-z2Cwn}J_>b8v>qWfJRc^;SDm3Uju-{eGxTPB<Dem;*T6(^1WFVWalTiXnu*-W|K
zv*(%85v%Sgm+HO0yX^~2$Y~5|?wgP`p+m;ZM>J!nzQWD4zGt`hbcep(Wt(I5`GP95
zx6nDOi1gD7B$W4j{~P=^pxx?9k)`0o^NRwNo#PeOKVwZ?rq^lyW~D9A!3>_RelF{r
G5}E)!;$Cn7
literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzd`Uz>RCwC#n9WgyFcimM2p?YHz`}_N
zxKRN$C>?AC)?f*CU<rG7Pi_NyqXGAf?oB>|?`1cR2OWuH$d1FC$q+~we*E(S`G+-4
zGji_095Id~2qEaW$J6^bUOlKbc09h0j>ECTFart$&bh3$ZHqu+gVi+xy|{FdAo{+a
zMU}qqfL`49edxOG`YgbWROHlQ9*_@h7(<vqDYJIKQc%92B2pQQTWcUHCC=&;?vxwq
zx|XFV3J8Kg>tSISLKH>cwhzOAAP!6hIXoX^(TOBYpsK2$1__gwfw7@c5K|R&E&;*_
z$ZsHwfaH0u4PgXi_q3DAZ5@PS`?%GHF*a*-VO-rr)ER#QNt0CG_opCbSwfa&MijLA
zuUSAAkOgD``IjJ*KJm21Pzzxb?hkzpSTk5Eg5U~G)|=g-A?tZITYGCDWH~+0la>?X
z&b6fkL6GI79f3GrZCush&VqE>mLT8zd0Rrxnqd$#dR>7Qv;T6V=3RgR0M}xpH?=#c
Q8~^|S07*qoM6N<$f{0SZdH?_b
diff --git a/app/assets/javascripts/application/learning_objects.coffee.erb b/app/assets/javascripts/application/learning_objects.coffee.erb
index b96acc68b..f779bd083 100644
--- a/app/assets/javascripts/application/learning_objects.coffee.erb
+++ b/app/assets/javascripts/application/learning_objects.coffee.erb
@@ -5,7 +5,7 @@ $ ->
$('.vote img').attr('src',"<%= image_path('icons/btn_like_down.png') %>")
$('.vote img').attr('alt', 'Curtir')
else if $('.vote img').attr('alt') == 'Curtir'
- $('.vote img').attr('src',"<%= image_path('icons/btn_like_nobg.png') %>")
+ $('.vote img').attr('src',"<%= image_path('icons/btn_like_up.png') %>")
$('.vote img').attr('alt', 'Descurtir')
return
return
diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss
index 35c1d0a7f..17cdf3e2c 100644
--- a/app/assets/stylesheets/application/learning_objects.scss
+++ b/app/assets/stylesheets/application/learning_objects.scss
@@ -200,9 +200,10 @@ $checked_icon: 'icons/checked.png';
height: 50px;
width: 50px;
display: inline;
+
.btn-primary{
border-color: #CBC9CA;
- background-color: #EDEBEC;
+ background-color: #EEEEED;
}
.btn-success{
@@ -213,12 +214,22 @@ $checked_icon: 'icons/checked.png';
a {
font-weight: 400;
}
- img {
+ img{
width: 20px;
height: 20px;
margin-bottom: 5px;
margin-top: 5px;
}
+ .share{
+ i{
+ padding-top: 4px;
+ color: #818080;
+ width: 20px;
+ height: 20px;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ }
+ }
.download{
line-height: 35px;
diff --git a/app/views/complaints/_complaints_button.html.erb b/app/views/complaints/_complaints_button.html.erb
index 9dad121a7..d64a323bc 100644
--- a/app/views/complaints/_complaints_button.html.erb
+++ b/app/views/complaints/_complaints_button.html.erb
@@ -1,4 +1,4 @@
<a type="button" class="add_to_complaint btn btn-primary" data-toggle="modal" data-target="#complaints_list_modal" title="Denunciar Objeto">
- <%= image_tag "icons/btn_report_nobg.png", alt: "Denunciar objeto" %>
+ <%= image_tag "icons/btn_report_up.png", alt: "Denunciar objeto" %>
</a>
<%= render 'complaints/form' %>
diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb
index fcf87647b..1ee4d1113 100644
--- a/app/views/learning_objects/show.html.erb
+++ b/app/views/learning_objects/show.html.erb
@@ -52,7 +52,7 @@
<div class="panel panel-default">
<h3>Detalhes do Objeto</h3>
<h4>NÃvel Escolar:</h4>
- <h5><%= @learning_object.get_metadata_value_of("dc.subject.category")%></h5>
+ <h5><%= @learning_object.topics.first.name%></h5>
<h4>Assunto:</h4>
<h5><%= @learning_object.topics.last.name%></h5>
@@ -69,7 +69,7 @@
<div class="action">
<%= link_to like_learning_object_path(id: @learning_object.id), class: 'vote btn btn-primary',method: :post, remote: true do %>
<% if @liked %>
- <%= image_tag "icons/btn_like_nobg.png", alt: "Descurtir" %>
+ <%= image_tag "icons/btn_like_up.png", alt: "Descurtir" %>
<% else %>
<%= image_tag "icons/btn_like_down.png", alt: "Curtir" %>
<% end %>
@@ -77,15 +77,16 @@
</div>
<div class="action">
<a tabindex="0" class="add-to-collection btn btn-primary" role="button" title="Adicionar as coleções" data-loid="<%= @learning_object.id %>">
- <%= image_tag "icons/btn_add_nobg.png", alt: "Adicionar à coleção" %>
+ <%= image_tag "icons/btn_add.png", alt: "Adicionar à coleção" %>
</a>
</div>
<div class="action">
<%= render 'complaints/complaints_button' %>
</div>
<div class="action">
- <a tabindex="1" class="btn btn-primary" role="button" title="Compartilhar" data-toggle="modal" data-target="#share_modal">
- <%= image_tag "icons/collection-add.png", alt: "Compartilhar" %>
+ <a tabindex="1" class="btn btn-primary share" role="button" title="Compartilhar" data-toggle="modal" data-target="#share_modal">
+ <i class="fa fa-share"></i>
+ <%#= image_tag "icons/collection-add.png", alt: "Compartilhar" %>
</a>
<%= render 'share_modal' %>
</div>
--
GitLab