Download as
Browse Code »

Commit f4507ee1c72bec11364ff789cb6d749c8ff70f17

Authored by Leandro Santos
2 parents 766b589d 5599d4d8
Exists in master and in 2 other branches production, staging

fix conflit

Showing 2 changed files with 57 additions and 18 deletions   Show diff stats
header.html.erb
  Diff comments   View file @f4507ee
1 <% if logged_in? && profile && current_person.is_member_of?(profile) %> 1 <% if logged_in? && profile && current_person.is_member_of?(profile) %>
2 2
3 - <ul class='custom-control-panel'> 3 + <ul id='custom-control-panel'>
4 <% if profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('perform_task')}).include?(current_person) %> 4 <% if profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('perform_task')}).include?(current_person) %>
5 - <li><a href="/myprofile/<%=profile.identifier%>/cms" class='control-panel-cms'>Gerenciar Conteúdo</a></li>  
6 - <li><a href='/myprofile/<%=profile.identifier%>/tasks' class='control-panel-todo'>Gerenciar Propostas</a></li>  
7 - <li><a href='/myprofile/<%=profile.identifier%>/profile_members' class='control-panel-members'>Gerenciar Integrantes</a></li>  
8 - <li><a href='/myprofile/<%=profile.identifier%>/profile_roles' class='control-panel-roles'>Gerenciar Papéis</a></li> 5 + <li><a href="/myprofile/<%=profile.identifier%>/cms" class='custom-control-panel-manage-content'>Gerenciar Conteúdo</a></li>
  6 + <li><a href='/myprofile/<%=profile.identifier%>/tasks' class='custom-control-panel-manage-proposals-before'>Gerenciar Propostas</a></li>
  7 + <li><a href='/myprofile/<%=profile.identifier%>/profile_members' class='custom-control-panel-manage-members'>Gerenciar Integrantes</a></li>
  8 + <li><a href='/myprofile/<%=profile.identifier%>/profile_roles' class='custom-control-panel-manage-roles'>Gerenciar Papéis</a></li>
  9 + <% end %>
  10 + <% if profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('view_tasks')}).include?(current_person) %>
  11 + <li><a href='/myprofile/<%=profile.identifier%>/tasks' class='custom-control-panel-manage-proposals-after'>Realizar Triagem</a></li>
9 <% end %> 12 <% end %>
10 - <li><a href='/myprofile/<%=profile.identifier%>/tasks' class='control-panel-todo'>Realizar Triagem</a></li>  
11 </ul> 13 </ul>
12 14
13 <% end %> 15 <% end %>
  16 +
  17 +<div style="clear: both;">&nbsp;</div>
@@ -25,7 +25,9 @@ @@ -25,7 +25,9 @@
25 } 25 }
26 26
27 span.not-logged-in { 27 span.not-logged-in {
  28 + margin-top: 80px;
28 display: block; 29 display: block;
  30 + text-align: center;
29 /*border: 1px solid red;*/ 31 /*border: 1px solid red;*/
30 height: 326px; 32 height: 326px;
31 background-image: url(images/logo_forum_dialoga_brasil.jpg); 33 background-image: url(images/logo_forum_dialoga_brasil.jpg);
@@ -34,17 +36,6 @@ span.not-logged-in { @@ -34,17 +36,6 @@ span.not-logged-in {
34 36
35 } 37 }
36 38
37 -.controller-profile .action-profile-index div#wrap-1,  
38 -.controller-content_viewer .action-content_viewer-view_page div#wrap-1 {  
39 - /*border: 1px solid red;*/  
40 - position: absolute;  
41 - top: 12%;  
42 - text-align: center;  
43 - width: 100%;  
44 -  
45 -}  
46 -  
47 -  
48 .controller-content_viewer .action-content_viewer-view_page form#top-search, 39 .controller-content_viewer .action-content_viewer-view_page form#top-search,
49 .controller-content_viewer .action-content_viewer-view_page #content, 40 .controller-content_viewer .action-content_viewer-view_page #content,
50 .controller-content_viewer .action-content_viewer-view_page #link-go-content, 41 .controller-content_viewer .action-content_viewer-view_page #link-go-content,
@@ -139,7 +130,7 @@ form#top-search, @@ -139,7 +130,7 @@ form#top-search,
139 background-repeat: repeat-x; 130 background-repeat: repeat-x;
140 height: 211px; 131 height: 211px;
141 bottom: 0px; 132 bottom: 0px;
142 - margin-top: 500px; 133 + margin-top: 50px;
143 } 134 }
144 135
145 .logged-in #theme-header{ 136 .logged-in #theme-header{
@@ -162,3 +153,47 @@ span.logged-in a:visited{ @@ -162,3 +153,47 @@ span.logged-in a:visited{
162 color: black; 153 color: black;
163 margin-left: 5px; 154 margin-left: 5px;
164 } 155 }
  156 +
  157 +.logged-in.controller-content_viewer .action-content_viewer-view_page #content,
  158 +.logged-in.controller-profile .action-profile-index #content,
  159 +.logged-in.controller-profile_editor #content{
  160 + display: block;
  161 +}
  162 +
  163 +body {
  164 + margin: 0;
  165 + padding: 0;
  166 +}
  167 +
  168 +div#wrap-2 {
  169 + margin: 0 2%;
  170 +}
  171 +
  172 +#custom-control-panel {
  173 + list-style: none;
  174 + margin: 0;
  175 + padding: 0;
  176 + height: 48px;
  177 + background-color: #7b6ba9;
  178 + border-bottom: 1px solid #CCCCCC;
  179 +}
  180 +
  181 +#custom-control-panel li {
  182 + float: left;
  183 +}
  184 +
  185 +#custom-control-panel li:hover {
  186 + background-color: #baa2ff;
  187 +}
  188 +
  189 +#custom-control-panel li + li {
  190 + border-left: 1px solid white;
  191 +}
  192 +
  193 +#custom-control-panel a {
  194 + padding: 20px;
  195 + line-height: 48px;
  196 + text-decoration: none;
  197 + color: #FFF;
  198 + font-weight: bold;
  199 +}