Download as
Browse Code »

Commit f9d47eac597891f2def64384f727c9d35e4d185d

Authored by Valessio Brito
2 parents 7cb1eb02 7e8e9493
Exists in master and in 2 other branches production, staging

Merge remote-tracking branch 'upstream/master'

Showing 11 changed files with 236 additions and 334 deletions   Show diff stats
appearance_menu.html.erb 0 → 100644
  Diff comments   View file @f9d47ea
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
  1 +<div id="control_panel_bar" class="menu_aparence controller-profile_editor">
  2 +
  3 +<ul class="control-panel">
  4 + <li>
  5 + <%= link_to(_('Edit sideboxes'), url_for(:controller => 'profile_design', :action => 'index'), :class => 'control-panel-blocks') %>
  6 + </li>
  7 +
  8 + <li>
  9 + <%= link_to(_('Edit Appearance'), url_for(:controller => 'profile_themes', :action => 'index'), :class => 'control-panel-design-editor') %>
  10 + </li>
  11 +
  12 + <li>
  13 + <%= link_to(_('Edit Header and Footer'), url_for(:controller => 'profile_editor', :action => 'header_footer'), :class => 'control-panel-header-and-footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
  14 + </li>
  15 +</ul>
  16 +
  17 +</div>
@@ -496,26 +496,25 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} @@ -496,26 +496,25 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
496 496
497 497
498 /****************** Barra do usuário ******************/ 498 /****************** Barra do usuário ******************/
499 -#barra-psocial { 499 +#top-bar {
500 position: relative; 500 position: relative;
501 height: 40px; 501 height: 40px;
502 margin: auto; 502 margin: auto;
503 - background: url(images/barra-psocial-bg.png) repeat-x; 503 + background: url(images/top-bar-bg.png) repeat-x;
504 } 504 }
505 505
506 -#barra-psocial.top {  
507 - background-image: none; 506 +#top-bar.top {
508 background-color: #fff; 507 background-color: #fff;
509 - height: 40px; 508 + height: 40px;
510 } 509 }
511 510
512 -#barra-psocial li { 511 +#top-bar li {
513 float: left; 512 float: left;
514 } 513 }
515 514
516 515
517 /*****Botões da barra do usuário - Menu - Pendẽncias - Mensagens *****/ 516 /*****Botões da barra do usuário - Menu - Pendẽncias - Mensagens *****/
518 -.btn_control_panel{ 517 +.btn_control_panel {
519 min-width: 40px; 518 min-width: 40px;
520 height: 40px; 519 height: 40px;
521 color: #999; 520 color: #999;
@@ -533,9 +532,60 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} @@ -533,9 +532,60 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
533 /*z-index: 99;*/ 532 /*z-index: 99;*/
534 } 533 }
535 534
536 -.btn_control_panel:hover { background-color: #eee; opacity:0.8;filter:alpha(opacity=80);} 535 +#user .logged-in #pending-tasks-count {
  536 + background-color: #eee;
  537 + padding-left: 15px;
  538 + border-left: 1px solid #999;
  539 + border-right: 1px solid #999;
  540 + margin-left: 15px;
  541 + height: 40px;
  542 + display: inline-block;
  543 +}
  544 +#user .logged-in #pending-tasks-count i {
  545 + left: 0;
  546 +}
537 547
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;} 548 +#theme-header .btn_control_panel #user a:hover {
  549 + background-color: #eee;
  550 + opacity:0.8;
  551 + filter:alpha(opacity=80);
  552 +}
  553 +#theme-header .btn_control_panel #user a {
  554 + display: inline-block;
  555 + margin: 0;
  556 +}
  557 +#theme-header .btn_control_panel #user a strong {
  558 + line-height: 40px;
  559 + padding: 10px 5px 10px 33px;
  560 +}
  561 +#theme-header .btn_control_panel #user a span {
  562 + line-height: 40px;
  563 +}
  564 +#theme-header .btn_control_panel #user a i {
  565 + left: 10px;
  566 + top: 12px;
  567 +}
  568 +#theme-header .btn_control_panel #user a .task-count {
  569 + padding: 5px;
  570 + margin-left: 16px;
  571 +}
  572 +#theme-header .btn_control_panel #user .ctrl-panel {
  573 + display: none;
  574 +}
  575 +
  576 +/*
  577 +#theme-header .btn_control_panel #user a strong:hover {
  578 + line-height: 40px;
  579 +}*/
  580 +
  581 +.btn_control_panel span{
  582 + border: 1px solid gray;
  583 + border-radius: 5px;
  584 + background-color: white;
  585 + padding: 3px;
  586 + color: #333;
  587 + display: inline;
  588 +}
539 589
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;} 590 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 591
@@ -559,8 +609,27 @@ a.btn_control_panel:hover ul li{display: block;} @@ -559,8 +609,27 @@ a.btn_control_panel:hover ul li{display: block;}
559 padding-left: 10px; 609 padding-left: 10px;
560 } 610 }
561 611
562 -.btn_tasks {  
563 - background: url(images/barra-menu-task.png) no-repeat 10px center #eee;padding-left: 30px; 612 +#navigation ul li#btn_profile {
  613 + border-left: 0;
  614 + padding: 0;
  615 + margin: 5px 10px;
  616 +}
  617 +#navigation ul li#btn_profile a {
  618 + border-left: 0;
  619 + padding: 0 10px;
  620 +}
  621 +#navigation ul li#btn_profile a img {
  622 + vertical-align: middle;
  623 +}
  624 +#navigation ul li#btn_profile span {
  625 + background: none;
  626 + padding: 0 0 0 5px;
  627 + color: rgb(170, 170, 170);
  628 + font-weight: bold;
  629 +}
  630 +
  631 +.icon-menu-tasks {
  632 + background-image: url(images/barra-menu-task.png);
564 } 633 }
565 634
566 .btn_msg { 635 .btn_msg {
@@ -590,9 +659,6 @@ a.btn_control_panel:hover ul li{display: block;} @@ -590,9 +659,6 @@ a.btn_control_panel:hover ul li{display: block;}
590 .task_list ul .task_box { 659 .task_list ul .task_box {
591 border-bottom: 1px solid #ccc; 660 border-bottom: 1px solid #ccc;
592 padding:16px; 661 padding:16px;
593 -/* display: inline-block;  
594 - float: left;  
595 - margin-right: 1em;*/  
596 } 662 }
597 663
598 .task_icon { 664 .task_icon {
@@ -632,55 +698,11 @@ a.btn_control_panel:hover ul li{display: block;} @@ -632,55 +698,11 @@ a.btn_control_panel:hover ul li{display: block;}
632 698
633 /**/ 699 /**/
634 700
635 - /*código "#control-panel" substituído por "#control_panel_bar" */  
636 -/*  
637 -#control-panel {  
638 - position: absolute;  
639 - width: 230px;  
640 - padding: 10px;  
641 -}  
642 -#control-panel .pending-tasks {background-color: white;}  
643 -  
644 -#control-panel .pending-tasks ul{  
645 - padding-left: 0;  
646 -}  
647 -  
648 -#control-panel .pending-tasks ul li{  
649 - margin: 10px 0;  
650 - padding: 10px 0;  
651 - border-bottom: 1px solid gray;  
652 -}  
653 -  
654 -#control-panel .control-panel {position: relative;}  
655 -  
656 -#control-panel .control-panel a,  
657 -#control-panel .control-panel a:visited {  
658 - clear: left;  
659 - border-bottom: 1px solid LightGray;  
660 -}  
661 -*/  
662 -  
663 -  
664 -  
665 /************* Bar Psocial Style - Menu Horizontal**************/ 701 /************* Bar Psocial Style - Menu Horizontal**************/
666 -/*  
667 -#user{  
668 - padding: 0px 2em;  
669 - top: -30px;  
670 - font-size: 12px;  
671 - right: 4em;  
672 -}  
673 -  
674 -.logged-in #user{  
675 - top: -40px;  
676 -}  
677 -*/  
678 702
679 #user{ 703 #user{
680 -  
681 - top: 0px;  
682 font-size: 12px; 704 font-size: 12px;
683 - position: relative; 705 + position: static;
684 z-index: 9; 706 z-index: 9;
685 } 707 }
686 708
@@ -693,11 +715,11 @@ a.btn_control_panel:hover ul li{display: block;} @@ -693,11 +715,11 @@ a.btn_control_panel:hover ul li{display: block;}
693 #user .logged-in { 715 #user .logged-in {
694 visibility: hidden; 716 visibility: hidden;
695 display: block; 717 display: block;
696 - background:url("images/barra-menu-user-bg.png") repeat-x bottom center #FEFEFE;  
697 - display: block;  
698 - padding: 2px 1em;  
699 - text-align: left;  
700 - width: 130px; 718 + background:url("images/barra-menu-user-bg.png") repeat-x bottom center #FEFEFE;
  719 + display: block;
  720 + padding: 0;
  721 + text-align: left;
  722 + width: 130px;
701 border-radius: 10px 723 border-radius: 10px
702 } 724 }
703 725
@@ -709,59 +731,22 @@ a.btn_control_panel:hover ul li{display: block;} @@ -709,59 +731,22 @@ a.btn_control_panel:hover ul li{display: block;}
709 } 731 }
710 732
711 733
712 -#user .logged-in a.admin-link,  
713 -#user .logged-in a.ctrl-panel,  
714 -#user .logged-in a#logout {  
715 - margin-top: 14px; 734 +#user .logged-in span.welcome {
  735 + display: none;
716 } 736 }
717 737
718 -  
719 -#user .logged-in span {display: none;}  
720 -  
721 #user .logged-in a { 738 #user .logged-in a {
722 width: auto; 739 width: auto;
723 } 740 }
724 741
725 -/*modificado devido a barra do usuário*/  
726 -/*  
727 -#user .logged-in #pending-tasks-count {  
728 - display: inline-block;  
729 - left: -30px;  
730 - position: absolute;  
731 - top: 0px;  
732 - visibility: visible;  
733 - text-align: right;  
734 -}  
735 -*/  
736 -  
737 -/*  
738 -.layout_user {  
739 - margin-left: 14px;  
740 - margin-top: 11px;  
741 - position: relative;  
742 - z-index: 9;  
743 - display: inline-block;  
744 -}  
745 -  
746 -.layout_user ul {margin-right: 24px;}  
747 -  
748 -.layout_user ul li {  
749 - display: inline;  
750 -}  
751 -*/  
752 /*info do usuário na barra do usuário*/ 742 /*info do usuário na barra do usuário*/
753 -#barra-psocial{} 743 +#top-bar .layout_user #user .logged-in a{text-decoration: none;}
754 744
755 -#barra-psocial .layout_user {}  
756 -  
757 -#barra-psocial .layout_user #user .logged-in a{text-decoration: none;}  
758 -  
759 -#barra-psocial .layout_user #user .logged-in { 745 +#top-bar .layout_user #user .logged-in {
760 visibility: visible; 746 visibility: visible;
761 display: block; 747 display: block;
762 background: none; 748 background: none;
763 display: block; 749 display: block;
764 - padding: 5px 5px 5px 5px;  
765 text-align: left; 750 text-align: left;
766 width: auto; 751 width: auto;
767 border-radius: 0; 752 border-radius: 0;
@@ -771,19 +756,14 @@ a.btn_control_panel:hover ul li{display: block;} @@ -771,19 +756,14 @@ a.btn_control_panel:hover ul li{display: block;}
771 .btn_control_panel #user span.not-logged-in, 756 .btn_control_panel #user span.not-logged-in,
772 .btn_control_panel #user span.not-logged-in span { 757 .btn_control_panel #user span.not-logged-in span {
773 margin: 5px 5px 5px 5px; 758 margin: 5px 5px 5px 5px;
774 -border: 0px solid #808080;  
775 -border-radius: 5px; 759 +border: 0;
776 background-color: transparent; 760 background-color: transparent;
777 padding: 3px; 761 padding: 3px;
778 color: #333; 762 color: #333;
779 -display: inline-block;  
780 } 763 }
781 764
782 -#barra-psocial .layout_user #user .not-logged-in a{text-decoration: none;} 765 +#top-bar .layout_user #user .not-logged-in a{text-decoration: none;}
783 766
784 -#barra-psocial .layout_user #user .not-logged-in {padding-left: 35px;}  
785 -  
786 -#barra-psocial .layout_user #user a i.icon-chat {display: none;}  
787 /*info do usuário no espaço do usuário*/ 767 /*info do usuário no espaço do usuário*/
788 #navigation-control{ 768 #navigation-control{
789 height: 100%; 769 height: 100%;
@@ -870,43 +850,6 @@ text-decoration: none; @@ -870,43 +850,6 @@ text-decoration: none;
870 850
871 /*fim de modificação da scroll bar DO ESPAÇO DO USUÁRIO */ 851 /*fim de modificação da scroll bar DO ESPAÇO DO USUÁRIO */
872 852
873 -/* * Internacionalização * */  
874 -  
875 -#participa-languages {  
876 - margin-right: 14px;  
877 - float: right;  
878 - vertical-align: top;  
879 - display: inline-block;  
880 -}  
881 -  
882 -#participa-languages ul {  
883 - margin: 0;  
884 -}  
885 -  
886 -#participa-languages ul li {  
887 - display: inline;  
888 - float: none;  
889 - line-height: 40px;  
890 -}  
891 -  
892 -#participa-languages a.flag {  
893 - color: #333;  
894 - text-decoration: none;  
895 - cursor: pointer;  
896 - background-repeat: no-repeat;  
897 - display: inline-block;  
898 - height: 17px;  
899 - width: 25px;  
900 - margin-left: 5px;  
901 -}  
902 -  
903 -.flag-en { background-image: url(images/flag-en.png) }  
904 -.flag-pt { background-image: url(images/flag-pt_br.png) }  
905 -  
906 -#participa-languages a span{ display: none }  
907 -  
908 -/* * FIM Internacionalização * */  
909 -  
910 /****************** FIM Barra do usuário ******************/ 853 /****************** FIM Barra do usuário ******************/
911 854
912 /****************** FIM Barra do usuário e Menu do usuário ******************/ 855 /****************** FIM Barra do usuário e Menu do usuário ******************/
@@ -914,6 +857,12 @@ text-decoration: none; @@ -914,6 +857,12 @@ text-decoration: none;
914 857
915 /****************** Painel de Controle ******************/ 858 /****************** Painel de Controle ******************/
916 859
  860 +.btn_home {
  861 + margin-right: 14px;
  862 + float: right;
  863 + line-height: 40px;
  864 +}
  865 +
917 .btn_home a{ 866 .btn_home a{
918 display: inline-block; 867 display: inline-block;
919 text-decoration: none; 868 text-decoration: none;
@@ -921,10 +870,6 @@ text-decoration: none; @@ -921,10 +870,6 @@ text-decoration: none;
921 width: 35px; 870 width: 35px;
922 background: url("images/logo.png") no-repeat left center transparent; 871 background: url("images/logo.png") no-repeat left center transparent;
923 } 872 }
924 -.btn_home {  
925 - position: relative;  
926 - top: -7px;  
927 -}  
928 873
929 /*Botão Painel de controle*/ 874 /*Botão Painel de controle*/
930 875
@@ -969,20 +914,10 @@ text-decoration: none; @@ -969,20 +914,10 @@ text-decoration: none;
969 914
970 #control_panel_bar.show { 915 #control_panel_bar.show {
971 padding-top: 0px; 916 padding-top: 0px;
972 - background-color: #ccc; 917 + background-color: rgb(248, 248, 248);
973 height: 80px; 918 height: 80px;
974 } 919 }
975 920
976 -#control_panel_bar.menu_content{  
977 - background-color: Tomato;  
978 -}  
979 -#control_panel_bar.menu_aparence{  
980 - background-color: seagreen;  
981 -}  
982 -#control_panel_bar.menu_settings{  
983 - background-color: lightSteelBlue;  
984 -}  
985 -  
986 #navigation { 921 #navigation {
987 text-align: right; 922 text-align: right;
988 position: static; 923 position: static;
@@ -1020,12 +955,16 @@ float: right; @@ -1020,12 +955,16 @@ float: right;
1020 } 955 }
1021 #navigation ul li:hover { 956 #navigation ul li:hover {
1022 cursor: pointer; 957 cursor: pointer;
  958 + background-color: rgb(112, 112, 112);
  959 + color: #FFF;
1023 } 960 }
1024 961
1025 #navigation ul li#btn_icon { 962 #navigation ul li#btn_icon {
1026 border: none; 963 border: none;
1027 padding: 4px; 964 padding: 4px;
1028 margin: 0; 965 margin: 0;
  966 + background: none;
  967 + cursor: auto;
1029 } 968 }
1030 969
1031 #control_panel_bar .btn_control_panel{ 970 #control_panel_bar .btn_control_panel{
@@ -1226,6 +1165,18 @@ float: right; @@ -1226,6 +1165,18 @@ float: right;
1226 #user #homepage-link i { 1165 #user #homepage-link i {
1227 display: none; 1166 display: none;
1228 } 1167 }
1229 -#user #homepage-link strong {  
1230 - padding: 10px 0 10px 35px; 1168 +
  1169 +#control_panel_bar .control-panel a {
  1170 + margin-bottom: 0;
  1171 + border: 0;
  1172 + line-height: normal;
  1173 + background-color: transparent;
  1174 +}
  1175 +#control_panel_bar .control-panel span {
  1176 + background: none;
  1177 + padding-left: 0;
  1178 +}
  1179 +
  1180 +.controller-profile_editor a.icon-new {
  1181 + background-image: url(../../../images/control-panel/text-editor.png);
1231 } 1182 }
content_menu.html.erb 0 → 100644
  Diff comments   View file @f9d47ea
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +<div id="control_panel_bar" class="menu_content controller-profile_editor">
  2 +
  3 +<ul class="control-panel">
  4 + <li>
  5 + <%= link_to(_('Manage Content'), url_for(:controller => 'cms'), :class => 'control-panel-cms') %>
  6 + </li>
  7 + <li>
  8 + <% article = @article || @page %>
  9 + <% parent_id = ((article && article.allow_children?) ? article : nil) %>
  10 + <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
  11 + </li>
  12 +</ul>
  13 +
  14 +</div>
header.html.erb
  Diff comments   View file @f9d47ea
@@ -3,43 +3,19 @@ @@ -3,43 +3,19 @@
3 3
4 <!-- Nova Barra de usuário --> 4 <!-- Nova Barra de usuário -->
5 5
6 -<div id="barra-psocial" class="top" > 6 +<div id="top-bar" class="top" >
7 <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu"> 7 <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu">
8 - <div class="layout_user">  
9 - <%= render :partial => 'layouts/user' %>  
10 - </div>  
11 -</div>  
12 -  
13 -<div class="btn_control_panel btn_tasks" title="Pedências" alt="pendências">  
14 - <span>20</span>  
15 -</div>  
16 -<!--  
17 -<div class="btn_control_panel btn_msg" title="Mensagens" alt="mensagens">  
18 - <span>362</span>  
19 -</div>  
20 ---> 8 + <div class="layout_user">
  9 + <%= render :partial => 'layouts/user' %>
  10 + </div>
  11 + </div>
21 12
22 <!-- 13 <!--
23 <div id="categories_menu"> 14 <div id="categories_menu">
24 <%= theme_include 'categories' %> 15 <%= theme_include 'categories' %>
25 </div> 16 </div>
26 --> 17 -->
27 - <div id="participa-languages">  
28 - <ul>  
29 - <li>  
30 - <a href="?lang=pt" class="flag flag-pt" title="Português"><span>Português</span></a>  
31 - </li>  
32 - <li>  
33 - <a href="?lang=en" class="flag flag-en" title="English"><span>English</span></a>  
34 - </li>  
35 - <li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">&nbsp;</a></li>  
36 - </ul>  
37 -  
38 - </div> 18 + <span class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">&nbsp;</a></span>
39 </div> 19 </div>
40 <!-- FIM Nova Barra de usuário --> 20 <!-- FIM Nova Barra de usuário -->
41 21
42 -  
43 -<%= theme_include 'task_list' %>  
44 -<%#= theme_include 'message_list' %>  
45 -  
navigation.html.erb
  Diff comments   View file @f9d47ea
1 <!-- *************** Painel de controle da comunidade ************** --> 1 <!-- *************** Painel de controle da comunidade ************** -->
2 -<li id="btn_settings">Configurações</li>  
3 -<li id="btn_aparence">Aparência</li>  
4 -<li id="btn_content">Conteúdo</li>  
5 -<li id="btn_icon"><span>&nbsp;</span></li> 2 +<% if profile && user %>
  3 + <li id="btn_settings">Configurações</li>
  4 + <li id="btn_aparence">Aparência</li>
  5 + <li id="btn_content">Conteúdo</li>
  6 + <li id="btn_icon"><span>&nbsp;</span></li>
  7 + <li id="btn_profile"><%= link_to(profile_image(profile, :icon) + content_tag(:span, profile.name), profile.public_profile_url) %></li>
6 8
7 -<div id="control_panel_bar" class="menu_content controller-profile_editor"> </div>  
8 -<div id="control_panel_bar" class="menu_aparence controller-profile_editor"> </div>  
9 -<div id="control_panel_bar" class="menu_settings controller-profile_editor"> </div> 9 + <%= theme_include 'content_menu' %>
  10 + <%= theme_include 'appearance_menu' %>
  11 + <%= theme_include 'settings_menu' %>
  12 +<% end %>
settings_menu.html.erb 0 → 100644
  Diff comments   View file @f9d47ea
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
  1 +<div id="control_panel_bar" class="menu_settings controller-profile_editor">
  2 +
  3 +<ul class="control-panel">
  4 + <li>
  5 + <%= link_to(profile.control_panel_settings_button[:title],
  6 + url_for(:controller => 'profile_editor', :action => 'edit'),
  7 + :class => "control-panel-#{profile.control_panel_settings_button[:icon]}") %>
  8 + </li>
  9 +
  10 + <li>
  11 + <%= link_to(_('Location'), url_for(:controller => 'maps', :action => 'edit_location'), :class => 'control-panel-edit-location') %>
  12 + </li>
  13 +
  14 + <%= content_tag(:li, link_to(_('Mail settings'), url_for(:controller => 'mailconf'), :class => 'control-panel-mail')) if profile.person? && MailConf.enabled? %>
  15 +
  16 + <li>
  17 + <%= link_to(_('Tasks'), url_for(:controller => 'tasks', :action => 'index'), :class => 'control-panel-todo') %>
  18 + </li>
  19 +
  20 + <%= content_tag(:li, link_to(_('Change Password'), url_for(:controller => 'account', :action => 'change_password'), :class => 'control-panel-change-password')) if profile.person? %>
  21 +
  22 + <%= content_tag(:li, link_to(_('Manage friends'), url_for(:controller => 'friends', :action => 'index'), :class => 'control-panel-friends')) if profile.person? %>
  23 +
  24 + <%= content_tag(:li, link_to(_('Manage Members'), url_for(:controller => 'profile_members'), :class => 'control-panel-members')) if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
  25 +
  26 + <%= content_tag(:li, link_to(_('Manage Products/Services'), url_for(:controller => 'manage_products'), :class => 'control-panel-products')) if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
  27 +
  28 + <% if !environment.enabled?('disable_asset_enterprises') %>
  29 + <% if profile.is_validation_entity? %>
  30 + <li><%= link_to(_('Enterprise Validation'), url_for(:controller => 'enterprise_validation'), :class => 'control-panel-validation') %></li>
  31 + <% end %>
  32 + <% if profile.person? %>
  33 + <li><%= link_to(_('Favorite Enterprises'), url_for(:controller => 'favorite_enterprises'), :class => 'control-panel-favorites') %></li>
  34 + <% end %>
  35 + <% end %>
  36 +
  37 + <% if profile.enterprise? %>
  38 + <% if profile.enabled? %>
  39 + <li><%= link_to(_('Disable'), url_for(:action => 'disable'), :class => 'control-panel-disable') %></li>
  40 + <% else %>
  41 + <li><%= link_to(_('Enable'), url_for(:action => 'enable'), :class => 'control-panel-enable') %></li>
  42 + <% end %>
  43 + <% end %>
  44 +
  45 + <%= content_tag(:li, link_to(_('Manage my groups'), url_for(:controller => 'memberships'), :class => 'control-panel-groups')) if profile.person? %>
  46 +
  47 + <li>
  48 + <%= link_to(_('Manage SPAM'), url_for(:controller => 'spam', :action => 'index'), :class => 'control-panel-manage-spam') %>
  49 + </li>
  50 +
  51 + <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
  52 + <li><%= link_to(button[:title], button[:url], :class => "control-panel-#{button[:icon]}") %></li>
  53 + <% end %>
  54 +
  55 +</ul>
  56 +
  57 +</div>
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 @import url(user-menu.css); 6 @import url(user-menu.css);
7 7
8 body, th, td, input { 8 body, th, td, input {
9 -font-size: 16px;  
10 font-family: Arial, sans-serif; 9 font-family: Arial, sans-serif;
11 } 10 }
12 11
@@ -318,4 +317,10 @@ height: 32px; @@ -318,4 +317,10 @@ height: 32px;
318 margin-top: 2px; 317 margin-top: 2px;
319 } 318 }
320 319
  320 +.comment-details .menu-submenu {
  321 + right: 3px;
  322 +}
321 323
  324 +.blog .vote-actions {
  325 + right: 30px;
  326 +}
task_list.html.erb
View file @7cb1eb0
@@ -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 -->  
@@ -39,24 +39,24 @@ @@ -39,24 +39,24 @@
39 $("#btn_open_control_panel").toggleClass("show"); 39 $("#btn_open_control_panel").toggleClass("show");
40 }); 40 });
41 41
42 -//abrir e fechar Painel de controle da comunidade// 42 +//abrir e fechar Painel de controle da comunidade//
43 //aba conteúdo// 43 //aba conteúdo//
44 $("#navigation ul li#btn_content").click(function(){ 44 $("#navigation ul li#btn_content").click(function(){
45 $("#control_panel_bar.menu_aparence").removeClass("show"); 45 $("#control_panel_bar.menu_aparence").removeClass("show");
46 $("#control_panel_bar.menu_settings").removeClass("show"); 46 $("#control_panel_bar.menu_settings").removeClass("show");
47 - $("#control_panel_bar.menu_content").toggleClass("show"); 47 + $("#control_panel_bar.menu_content").toggleClass("show", 200);
48 }); 48 });
49 //aba aparência// 49 //aba aparência//
50 $("#navigation ul li#btn_aparence").click(function(){ 50 $("#navigation ul li#btn_aparence").click(function(){
51 $("#control_panel_bar.menu_settings").removeClass("show"); 51 $("#control_panel_bar.menu_settings").removeClass("show");
52 $("#control_panel_bar.menu_content").removeClass("show"); 52 $("#control_panel_bar.menu_content").removeClass("show");
53 - $("#control_panel_bar.menu_aparence").toggleClass("show"); 53 + $("#control_panel_bar.menu_aparence").toggleClass("show", 200);
54 }); 54 });
55 //aba Configurações// 55 //aba Configurações//
56 $("#navigation ul li#btn_settings").click(function(){ 56 $("#navigation ul li#btn_settings").click(function(){
57 $("#control_panel_bar.menu_content").removeClass("show"); 57 $("#control_panel_bar.menu_content").removeClass("show");
58 $("#control_panel_bar.menu_aparence").removeClass("show"); 58 $("#control_panel_bar.menu_aparence").removeClass("show");
59 - $("#control_panel_bar.menu_settings").toggleClass("show"); 59 + $("#control_panel_bar.menu_settings").toggleClass("show", 200);
60 }); 60 });
61 61
62 62
@@ -8,3 +8,6 @@ @@ -8,3 +8,6 @@
8 .activity_menu_item { 8 .activity_menu_item {
9 cursor: pointer; 9 cursor: pointer;
10 } 10 }
  11 +#navigation-control {
  12 + font-size: 14px;
  13 +}
user_menu.html.erb
  Diff comments   View file @f9d47ea
@@ -3,25 +3,18 @@ @@ -3,25 +3,18 @@
3 <div class="perfil"> 3 <div class="perfil">
4 <ul class="profile_menu"> 4 <ul class="profile_menu">
5 <li class="name"><h1 class="title"><%= person.name %></h1></li> 5 <li class="name"><h1 class="title"><%= person.name %></h1></li>
6 - <li class="picture"><%= profile_image(person, :big) %></li> 6 + <li class="picture"><%= link_to(profile_image(person, :big), person.public_profile_url) %></li>
7 <!--<li class="user_status online"><span>&#9679;</span> Disponível</li>--> 7 <!--<li class="user_status online"><span>&#9679;</span> Disponível</li>-->
8 </ul> 8 </ul>
9 </div> 9 </div>
10 <%#= render :partial => 'layouts/user' %> 10 <%#= render :partial => 'layouts/user' %>
11 <div class="menu_user"> 11 <div class="menu_user">
12 <ul class="activity_menu"> 12 <ul class="activity_menu">
13 - <li class="activity_menu_item qpost"><div>Blog<span class="arrow">&#9660;</span></div>  
14 - <ul class="quick_post">  
15 - <li>Quick Post</li>  
16 - </ul>  
17 - </li>  
18 - <li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li>  
19 - <li class="activity_menu_item"><div>Artigos Recentes<span class="arrow">&#9660;</div></li>  
20 <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li> 13 <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li>
21 <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li> 14 <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li>
22 - <li class="activity_menu_item"><div>Galeria<span class="arrow">&#9660;</div></li>  
23 <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li> 15 <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li>
24 <li class="activity_menu_item"><%= link_to _("Communities"), url_for(:controller => :profile, :action => :communities, :profile => person.identifier) %></li> 16 <li class="activity_menu_item"><%= link_to _("Communities"), url_for(:controller => :profile, :action => :communities, :profile => person.identifier) %></li>
  17 + <li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li>
25 </ul> 18 </ul>
26 </div> 19 </div>
27 </div> 20 </div>