Download as
Browse Code »

Commit ee573e3dd5773d6f837326bb7e41c375d42e7cb2

Authored by Victor Costa
1 parent b8075828
Exists in master and in 3 other branches new-theme, production, staging

fix task link

Showing 3 changed files with 29 additions and 127 deletions   Show diff stats
@@ -515,7 +515,7 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} @@ -515,7 +515,7 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
515 515
516 516
517 /*****Botões da barra do usuário - Menu - Pendẽncias - Mensagens *****/ 517 /*****Botões da barra do usuário - Menu - Pendẽncias - Mensagens *****/
518 -.btn_control_panel{ 518 +.btn_control_panel {
519 min-width: 40px; 519 min-width: 40px;
520 height: 40px; 520 height: 40px;
521 color: #999; 521 color: #999;
@@ -533,9 +533,30 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} @@ -533,9 +533,30 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
533 /*z-index: 99;*/ 533 /*z-index: 99;*/
534 } 534 }
535 535
  536 +#user .logged-in #pending-tasks-count {
  537 + background-color: #eee;
  538 + padding-left: 15px;
  539 + border-left: 1px solid #999;
  540 + border-right: 1px solid #999;
  541 + margin-left: 15px;
  542 + height: 40px;
  543 + display: inline-block;
  544 +}
  545 +#user .logged-in #pending-tasks-count i {
  546 + left: 0;
  547 +}
  548 +
536 .btn_control_panel:hover { background-color: #eee; opacity:0.8;filter:alpha(opacity=80);} 549 .btn_control_panel:hover { background-color: #eee; opacity:0.8;filter:alpha(opacity=80);}
537 550
538 -.btn_control_panel span{margin:8px 5px 5px 5px; border: 1px solid gray;border-radius: 5px; background-color: white; padding: 3px;color: #333;display: inline-block;} 551 +.btn_control_panel span{
  552 + margin:8px 5px 5px 5px;
  553 + border: 1px solid gray;
  554 + border-radius: 5px;
  555 + background-color: white;
  556 + padding: 3px;
  557 + color: #333;
  558 + display: inline;
  559 +}
539 560
540 a.btn_control_panel span{margin:0px; border: 0px solid gray;border-radius: 0px; background-color: transparent; padding: 0px;color: #333;display: inline-block;height: 35px;} 561 a.btn_control_panel span{margin:0px; border: 0px solid gray;border-radius: 0px; background-color: transparent; padding: 0px;color: #333;display: inline-block;height: 35px;}
541 562
@@ -559,8 +580,8 @@ a.btn_control_panel:hover ul li{display: block;} @@ -559,8 +580,8 @@ a.btn_control_panel:hover ul li{display: block;}
559 padding-left: 10px; 580 padding-left: 10px;
560 } 581 }
561 582
562 -.btn_tasks {  
563 - background: url(images/barra-menu-task.png) no-repeat 10px center #eee;padding-left: 30px; 583 +.icon-menu-tasks {
  584 + background-image: url(images/barra-menu-task.png);
564 } 585 }
565 586
566 .btn_msg { 587 .btn_msg {
@@ -716,7 +737,9 @@ a.btn_control_panel:hover ul li{display: block;} @@ -716,7 +737,9 @@ a.btn_control_panel:hover ul li{display: block;}
716 } 737 }
717 738
718 739
719 -#user .logged-in span {display: none;} 740 +#user .logged-in span.welcome {
  741 + display: none;
  742 +}
720 743
721 #user .logged-in a { 744 #user .logged-in a {
722 width: auto; 745 width: auto;
header.html.erb
  Diff comments   View file @ee573e3
@@ -10,10 +10,10 @@ @@ -10,10 +10,10 @@
10 </div> 10 </div>
11 </div> 11 </div>
12 12
  13 +<!--
13 <div class="btn_control_panel btn_tasks" title="Pedências" alt="pendências"> 14 <div class="btn_control_panel btn_tasks" title="Pedências" alt="pendências">
14 <span>20</span> 15 <span>20</span>
15 </div> 16 </div>
16 -<!--  
17 <div class="btn_control_panel btn_msg" title="Mensagens" alt="mensagens"> 17 <div class="btn_control_panel btn_msg" title="Mensagens" alt="mensagens">
18 <span>362</span> 18 <span>362</span>
19 </div> 19 </div>
@@ -39,7 +39,3 @@ @@ -39,7 +39,3 @@
39 </div> 39 </div>
40 <!-- FIM Nova Barra de usuário --> 40 <!-- FIM Nova Barra de usuário -->
41 41
42 -  
43 -<%= theme_include 'task_list' %>  
44 -<%#= theme_include 'message_list' %>  
45 -  
task_list.html.erb
View file @b807582
@@ -1,117 +0,0 @@ @@ -1,117 +0,0 @@
1 -<div id="task_list" class="task_list hide">  
2 -<!-- Task list do participa -->  
3 -  
4 - <ul class="task-list">  
5 -  
6 - <div class="task_box" id="task-906">  
7 -  
8 - <div class="task_icon">  
9 - <img src="/images/icons-app/community-minor.png" alt="Federalismo em debate">  
10 - </div>  
11 -  
12 - <div class="task_decisions">  
13 - <input class="task_accept_radio" id="decision-finish-906" name="tasks[906][decision]" task_id="906" type="radio" value="finish">  
14 - <label for="decision-finish-906">Aceitar</label>  
15 - <input class="task_reject_radio" id="decision-cancel-906" name="tasks[906][decision]" task_id="906" type="radio" value="cancel">  
16 - <label for="decision-cancel-906">Rejeitar</label>  
17 - <input checked="checked" class="task_skip_radio" id="decision-skip-906" name="tasks[906][decision]" task_id="906" type="radio" value="skip">  
18 - <label for="decision-skip-906">Pular</label>  
19 - </div><!-- class="task_decisions" -->  
20 -  
21 - <strong class="task_title" style="margin-right: 175px;">  
22 - Nova comunidade  
23 - </strong>  
24 -  
25 - <div class="task_information">  
26 - <a href="http://hom.psocial.sg.gov.br/profile/gabrielbarbosa">Gabriel de Souza Barbosa</a> quer criar a comunidade <span class="task_target">Federalismo em debate</span> sem descrição.  
27 - </div>  
28 -  
29 - <div id="on-reject-information-906" style="display: none">  
30 - <div class="formfieldline">  
31 - <label class="formlabel" for="tasks_906_task_reject_explanation">Explicação para a rejeição</label>  
32 - <div class="formfield type-textarea">  
33 - <textarea cols="40" id="tasks_906_task_reject_explanation" name="tasks[906][task][reject_explanation]" rows="5"></textarea>  
34 - </div>  
35 - </div>  
36 - </div>  
37 -  
38 - </div><!-- class="task_box" -->  
39 -  
40 -<div class="task_box" id="task-906">  
41 -  
42 - <div class="task_icon">  
43 - <img src="/images/icons-app/community-minor.png" alt="Federalismo em debate">  
44 - </div>  
45 -  
46 - <div class="task_decisions">  
47 - <input class="task_accept_radio" id="decision-finish-906" name="tasks[906][decision]" task_id="906" type="radio" value="finish">  
48 - <label for="decision-finish-906">Aceitar</label>  
49 - <input class="task_reject_radio" id="decision-cancel-906" name="tasks[906][decision]" task_id="906" type="radio" value="cancel">  
50 - <label for="decision-cancel-906">Rejeitar</label>  
51 - <input checked="checked" class="task_skip_radio" id="decision-skip-906" name="tasks[906][decision]" task_id="906" type="radio" value="skip">  
52 - <label for="decision-skip-906">Pular</label>  
53 - </div><!-- class="task_decisions" -->  
54 -  
55 - <strong class="task_title" style="margin-right: 175px;">  
56 - Nova comunidade  
57 - </strong>  
58 -  
59 - <div class="task_information">  
60 - <a href="http://hom.psocial.sg.gov.br/profile/gabrielbarbosa">Gabriel de Souza Barbosa</a> quer criar a comunidade <span class="task_target">Federalismo em debate</span> sem descrição.  
61 - </div>  
62 -  
63 - <div id="on-reject-information-906" style="display: none">  
64 - <div class="formfieldline">  
65 - <label class="formlabel" for="tasks_906_task_reject_explanation">Explicação para a rejeição</label>  
66 - <div class="formfield type-textarea">  
67 - <textarea cols="40" id="tasks_906_task_reject_explanation" name="tasks[906][task][reject_explanation]" rows="5"></textarea>  
68 - </div>  
69 - </div>  
70 - </div>  
71 -  
72 - </div><!-- class="task_box" -->  
73 -<div class="task_box" id="task-906">  
74 -  
75 - <div class="task_icon">  
76 - <img src="/images/icons-app/community-minor.png" alt="Federalismo em debate">  
77 - </div>  
78 -  
79 - <div class="task_decisions">  
80 - <input class="task_accept_radio" id="decision-finish-906" name="tasks[906][decision]" task_id="906" type="radio" value="finish">  
81 - <label for="decision-finish-906">Aceitar</label>  
82 - <input class="task_reject_radio" id="decision-cancel-906" name="tasks[906][decision]" task_id="906" type="radio" value="cancel">  
83 - <label for="decision-cancel-906">Rejeitar</label>  
84 - <input checked="checked" class="task_skip_radio" id="decision-skip-906" name="tasks[906][decision]" task_id="906" type="radio" value="skip">  
85 - <label for="decision-skip-906">Pular</label>  
86 - </div><!-- class="task_decisions" -->  
87 -  
88 - <strong class="task_title" style="margin-right: 175px;">  
89 - Nova comunidade  
90 - </strong>  
91 -  
92 - <div class="task_information">  
93 - <a href="http://hom.psocial.sg.gov.br/profile/gabrielbarbosa">Gabriel de Souza Barbosa</a> quer convencer a comunidade de que <span class="task_target">Federalismo em debate</span> é a melhor solução.  
94 - </div>  
95 -  
96 - <div id="on-reject-information-906" style="display: none">  
97 - <div class="formfieldline">  
98 - <label class="formlabel" for="tasks_906_task_reject_explanation">Explicação para a rejeição</label>  
99 - <div class="formfield type-textarea">  
100 - <textarea cols="40" id="tasks_906_task_reject_explanation" name="tasks[906][task][reject_explanation]" rows="5"></textarea>  
101 - </div>  
102 - </div>  
103 - </div>  
104 -  
105 - </div><!-- class="task_box" -->  
106 -  
107 -<div class="button-bar">  
108 - <input class="button with-text icon-save submit" name="commit" type="submit" value="Aplicar!">  
109 - <a href="#" class="button icon-text-plain with-text" title="Ver tarefas processadas">&nbsp;<span>Ver Todas</span></a>  
110 - <a href="#" id="close_task" class="button icon-back with-text" title="Voltar ao painel de controle">&nbsp;<span>Fechar</span></a>  
111 - <br style="clear: left;">  
112 -</div>  
113 -  
114 - </ul>  
115 -<!-- FIM Task list do participa -->  
116 -</div>  
117 -<!-- FIM Menu Pendências -->