Download as
Browse Code »

Commit a9356b41da5047949c40fd263b980e80fd89b40f

Authored by Fabio Kaiser Rauber
2 parents 8e5fa3e8 aaa3b6f7
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'master' of https://github.com/TracyWebTech/colab

Showing 9 changed files with 91 additions and 70 deletions   Show diff stats
puppet/modules/colab/files/root_id_rsa
View file @8e5fa3e
@@ -1,28 +0,0 @@ @@ -1,28 +0,0 @@
1 ------BEGIN RSA PRIVATE KEY-----  
2 -MIIEpAIBAAKCAQEAuCnJ7elkn0ZoMiZZIbZ8wigD1gcMwKyTVrPfnel9eNK9c/8R  
3 -6QsE6xrNoNQmjTsbGJF88RZkz7cYxX9YFIXatL+Wckq+GUirWMUm/2zIR8rqo31X  
4 -l/0E/nXWED3k9L3ZZwB3PzY15vDhkt+Gv+zpdYQkL6Jj23IAeDM1Q5/cq3Ha2z5l  
5 -1L0z7wN+rttfE879Jxv7plC3ceVzm7jj5aYRH2dZFgkjgr3DmAI0fh+15To4apkQ  
6 -fw/tvGPfogIDRhQybts5UvY2UnK4/ize+IswBTgTlNV864bLqpkgcY8drdX04Kxu  
7 -34qBG1FGtj4MDP3kjJdoFOolV4vn+5nGQ0A6awIDAQABAoIBAGO7ZbpskWxb8aNu  
8 -9wf1znxKtUEb0kEpdCUZBfl7b9KVtblyoZ1ltUUo38DAAxyqrJLSfyoEaZW/Xy/d  
9 -NbLvhjAqLOw6I9aHbxuEsQjUPWX7srPU9jG9+Q1gfQuQqUQM6AYKz4kw72HggxhJ  
10 -6qxXPVrBs+MD+zXk9/IgMTEtCpDhDVNdy1bEsiguEeUFOIvDCDqN4DN1iWy5i1Xn  
11 -aJTYp/JPbGqohp9XJ1vQPhQin5s0el21OxW61xJRR12Y2VAxKpmwXC5SdAT+z7bY  
12 -k2TXbujyP68MZKmnruhouRy5gtFwZpehGgoycuBWrwG2S2iEvJy7AsPFe90wEbQb  
13 -4xYjOtkCgYEA30jPvOurvRyM5Kpl6zhN9E1x4kqtuJsuRvGCqXfQtVZXD2b6hkGF  
14 -PHKVsCUco9t+86ZQZ2xoyMDuLxEelCnbktX0P8RfH/e1CqADo3NIxkd+vJsS/PYo  
15 -wEUcEYFaTKEzJJaG1ZApf4m14scSeMvirTy3sfVyZRWhcHRB9hLknncCgYEA0yWU  
16 -HMGC57GMXO3Wc0Bs7oaC2N7WbPk+reQ4rVxVLu1qOtpkzwpfwUFQBqn7LIpIX9Jc  
17 -B3MFOe9ndA5jNRwECMPoMd1d9t+OkTjf3cpiPwludph/cReIho1bouW2xzuR7XO0  
18 -J1dLnmeYCKZQ1lKysK0bGbkRoXAz6yzK8oBc/K0CgYBV7YpstPF5rLQYB++DDz8I  
19 -xokOQhkK00WC7cyP9VkvgBOvDL1az3o74gjzKcUU1hLMJ3QH6TOGFqFTIa537Ifg  
20 -wU/m/mZxQf29IglkbKhUDg2a/b7X9M+H9tCvd+1NUjgBW6B2La2atF93746PSD9q  
21 -1dQHu2KTvjhLs6Hy1iB/TwKBgQCmLU4rb5VSOmdJABqmbE8PTygN/Rtvep59B0Ag  
22 -GKomG85ecWGjnPuNwpR0GjXHcTHS0GGDr1+uoB+gtG4Z72mxaFYHYLzCPmIbI1L1  
23 -YIIAMLESf6TVYfseQoSbaQV4Ogb4hfaEe+zUx51dOWAnvcBK0oKgtQoOL5t8/Kzh  
24 -PGtypQKBgQDfMeSWp6Xztv3EAoBpuh6+T5nfcqEJ7FgkddxBVxDCJCOljDjZrjOk  
25 -YR3Yz7n3hN/0OfXxByL+EnP3EL3sIiIvc/IKxw3E2faU8iPXWyXmYbL/vHDs5+BX  
26 -h29DcOwAoANga1DxlQrJ6uGSb4yKkxaamTIJJMSJ5G9UUf90ie3Y2w==  
27 ------END RSA PRIVATE KEY-----  
28 -  
puppet/modules/colab/files/root_id_rsa.pub
View file @8e5fa3e
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Kcnt6WSfRmgyJlkhtnzCKAPWBwzArJNWs9+d6X140r1z/xHpCwTrGs2g1CaNOxsYkXzxFmTPtxjFf1gUhdq0v5ZySr4ZSKtYxSb/bMhHyuqjfVeX/QT+ddYQPeT0vdlnAHc/NjXm8OGS34a/7Ol1hCQvomPbcgB4MzVDn9yrcdrbPmXUvTPvA36u218Tzv0nG/umULdx5XObuOPlphEfZ1kWCSOCvcOYAjR+H7XlOjhqmRB/D+28Y9+iAgNGFDJu2zlS9jZScrj+LN74izAFOBOU1XzrhsuqmSBxjx2t1fTgrG7fioEbUUa2PgwM/eSMl2gU6iVXi+f7mcZDQDpr demouser@demoserver  
puppet/modules/colab/manifests/cronjobs.pp
  Diff comments   View file @a9356b4
@@ -47,7 +47,7 @@ class colab::cronjobs { @@ -47,7 +47,7 @@ class colab::cronjobs {
47 user => 'root', 47 user => 'root',
48 require => [ 48 require => [
49 File['/mnt/mailman/archives/'], 49 File['/mnt/mailman/archives/'],
50 - File['root-ssh-private-key'], 50 + #File['root-ssh-private-key'],
51 Package['sshfs'], 51 Package['sshfs'],
52 ], 52 ],
53 } 53 }
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @a9356b4
@@ -51,23 +51,24 @@ class colab { @@ -51,23 +51,24 @@ class colab {
51 path => '/root/.ssh', 51 path => '/root/.ssh',
52 } 52 }
53 53
54 - file { 'root-ssh-private-key':  
55 - ensure => present,  
56 - mode => '0600',  
57 - path => '/root/.ssh/id_rsa',  
58 - source => 'puppet:///modules/colab/root_id_rsa',  
59 - owner => root,  
60 - group => root,  
61 - }  
62 -  
63 - file { 'root-ssh-public-key':  
64 - ensure => present,  
65 - mode => '0644',  
66 - path => '/root/.ssh/id_rsa.pub',  
67 - source => 'puppet:///modules/colab/root_id_rsa.pub',  
68 - owner => root,  
69 - group => root,  
70 - } 54 + # Should generate instead of copying
  55 + #file { 'root-ssh-private-key':
  56 + # ensure => present,
  57 + # mode => '0600',
  58 + # path => '/root/.ssh/id_rsa',
  59 + # source => 'puppet:///modules/colab/root_id_rsa',
  60 + # owner => root,
  61 + # group => root,
  62 + #}
  63 +
  64 + #file { 'root-ssh-public-key':
  65 + # ensure => present,
  66 + # mode => '0644',
  67 + # path => '/root/.ssh/id_rsa.pub',
  68 + # source => 'puppet:///modules/colab/root_id_rsa.pub',
  69 + # owner => root,
  70 + # group => root,
  71 + #}
71 72
72 supervisor::app { 'colab': 73 supervisor::app { 'colab':
73 command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -c colab/gunicorn.conf.py', 74 command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -c colab/gunicorn.conf.py',
puppet/modules/colab/templates/nginx/site_default.erb
  Diff comments   View file @a9356b4
@@ -12,7 +12,7 @@ server { @@ -12,7 +12,7 @@ server {
12 listen 80; 12 listen 80;
13 13
14 root /; 14 root /;
15 - server_name colab.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost; 15 + server_name colab.interlegis.leg.br colab01a.interlegis.leg.br colab01b.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost;
16 16
17 location @django { 17 location @django {
18 proxy_hide_header Vary; 18 proxy_hide_header Vary;
@@ -23,10 +23,23 @@ server { @@ -23,10 +23,23 @@ server {
23 proxy_redirect off; 23 proxy_redirect off;
24 proxy_set_header X-Real-IP $remote_addr; 24 proxy_set_header X-Real-IP $remote_addr;
25 proxy_set_header X-Scheme $scheme; 25 proxy_set_header X-Scheme $scheme;
  26 + proxy_set_header X-Forwarded-Protocol https;
26 proxy_pass http://django; 27 proxy_pass http://django;
27 access_log /var/log/nginx/proxy-access.log proxy; 28 access_log /var/log/nginx/proxy-access.log proxy;
28 } 29 }
29 30
  31 + location /http-bind {
  32 + proxy_pass http://127.0.0.1:5280;
  33 + }
  34 +
  35 + location /chrome {
  36 + proxy_pass http://ambientedev01a.interlegis.leg.br;
  37 + }
  38 +
  39 + location /raw-attachment {
  40 + proxy_pass http://ambientedev01a.interlegis.leg.br;
  41 + }
  42 +
30 location / { 43 location / {
31 try_files /home/colab/colab/www$uri @django; 44 try_files /home/colab/colab/www$uri @django;
32 } 45 }
requirements.txt
  Diff comments   View file @a9356b4
@@ -31,6 +31,7 @@ django-revproxy @@ -31,6 +31,7 @@ django-revproxy
31 31
32 # Converse.js (XMPP client) 32 # Converse.js (XMPP client)
33 django-conversejs==0.2.8 33 django-conversejs==0.2.8
  34 +git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent
34 35
35 # Feedzilla (planet) and deps 36 # Feedzilla (planet) and deps
36 #feedzilla==0.22 37 #feedzilla==0.22
src/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @a9356b4
@@ -4,6 +4,11 @@ @@ -4,6 +4,11 @@
4 {% block head_js %} 4 {% block head_js %}
5 <script> 5 <script>
6 $(function() { 6 $(function() {
  7 +
  8 + // Reset buttons to default state
  9 + $('.set-primary').button('reset');
  10 + $('.delete-email').button('reset');
  11 +
7 $('#add-email').on('click', function(event) { 12 $('#add-email').on('click', function(event) {
8 $.ajax({ 13 $.ajax({
9 url: "{% url 'archive_email_view' %}", 14 url: "{% url 'archive_email_view' %}",
@@ -61,6 +66,7 @@ $(function() { @@ -61,6 +66,7 @@ $(function() {
61 $('#alert-js').removeClass('alert-warning').addClass('alert-success'); 66 $('#alert-js').removeClass('alert-warning').addClass('alert-success');
62 $('#alert-js').show(); 67 $('#alert-js').show();
63 window.scroll(0, 0); 68 window.scroll(0, 0);
  69 + $('.verify-email').button('reset');
64 }); 70 });
65 71
66 event.preventDefault(); 72 event.preventDefault();
@@ -82,6 +88,19 @@ $(function() { @@ -82,6 +88,19 @@ $(function() {
82 event.preventDefault(); 88 event.preventDefault();
83 }); 89 });
84 90
  91 + // User feedbacks
  92 + $('.panel-default').on('click', '.set-primary', function() {
  93 + $('.set-primary').button('loading');
  94 + });
  95 +
  96 + $('.panel-default').on('click', '.verify-email', function() {
  97 + $('.verify-email').button('loading');
  98 + });
  99 +
  100 + $('.panel-default').on('click', '.delete-email', function() {
  101 + $('.delete-email').button('loading');
  102 + });
  103 +
85 }); 104 });
86 </script> 105 </script>
87 {% endblock %} 106 {% endblock %}
@@ -135,8 +154,8 @@ $(function() { @@ -135,8 +154,8 @@ $(function() {
135 <span class="label label-success">{% trans "Primary" %}</span> 154 <span class="label label-success">{% trans "Primary" %}</span>
136 {% else %} 155 {% else %}
137 <div class="text-right"> 156 <div class="text-right">
138 - <button class="btn btn-default set-primary">{% trans "Set as Primary" %}</button>  
139 - <button class="btn btn-danger delete-email">{% trans "Delete" %}</button> 157 + <button class="btn btn-default set-primary" data-loading-text="{% trans 'Setting...' %}">{% trans "Set as Primary" %}</button>
  158 + <button class="btn btn-danger delete-email" data-loading-text="{% trans 'Deleting...' %}">{% trans "Delete" %}</button>
140 </div> 159 </div>
141 {% endif %} 160 {% endif %}
142 <hr /> 161 <hr />
@@ -147,7 +166,7 @@ $(function() { @@ -147,7 +166,7 @@ $(function() {
147 {% gravatar user_.email 30 %} 166 {% gravatar user_.email 30 %}
148 <span class="email-address">{{ email.address }}</span> 167 <span class="email-address">{{ email.address }}</span>
149 <div class="text-right"> 168 <div class="text-right">
150 - <button class="btn btn-default verify-email"><span class="icon-warning-sign"></span> {% trans "Verify" %}</button> 169 + <button class="btn btn-default verify-email" data-loading-text="{% trans 'Sending verification...' %}"><span class="icon-warning-sign"></span> {% trans "Verify" %}</button>
151 <button class="btn btn-danger delete-email">{% trans "Delete" %}</button> 170 <button class="btn btn-danger delete-email">{% trans "Delete" %}</button>
152 </div> 171 </div>
153 <hr /> 172 <hr />
src/locale/pt_BR/LC_MESSAGES/django.mo
View file @a9356b4
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @a9356b4
@@ -7,7 +7,7 @@ msgid &quot;&quot; @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 msgstr "" 7 msgstr ""
8 "Project-Id-Version: PACKAGE VERSION\n" 8 "Project-Id-Version: PACKAGE VERSION\n"
9 "Report-Msgid-Bugs-To: \n" 9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2013-11-13 15:58-0200\n" 10 +"POT-Creation-Date: 2013-11-14 15:22-0200\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -138,52 +138,64 @@ msgstr &quot;Participações em comunidades internas&quot; @@ -138,52 +138,64 @@ msgstr &quot;Participações em comunidades internas&quot;
138 msgid "No contributions of this user so far." 138 msgid "No contributions of this user so far."
139 msgstr "Não há posts deste usuário até agora." 139 msgstr "Não há posts deste usuário até agora."
140 140
141 -#: accounts/templates/accounts/user_update_form.html:58 141 +#: accounts/templates/accounts/user_update_form.html:63
142 msgid "We sent a verification email to " 142 msgid "We sent a verification email to "
143 msgstr "Enviamos um email de verificação para " 143 msgstr "Enviamos um email de verificação para "
144 144
145 -#: accounts/templates/accounts/user_update_form.html:59 145 +#: accounts/templates/accounts/user_update_form.html:64
146 msgid "Please follow the instructions in it." 146 msgid "Please follow the instructions in it."
147 msgstr "Por favor, siga as instruções." 147 msgstr "Por favor, siga as instruções."
148 148
149 -#: accounts/templates/accounts/user_update_form.html:94 149 +#: accounts/templates/accounts/user_update_form.html:113
150 msgid "profile information" 150 msgid "profile information"
151 msgstr "informações do perfil" 151 msgstr "informações do perfil"
152 152
153 -#: accounts/templates/accounts/user_update_form.html:99 153 +#: accounts/templates/accounts/user_update_form.html:118
154 msgid "Change your avatar at Gravatar.com" 154 msgid "Change your avatar at Gravatar.com"
155 msgstr "Troque seu avatar em Gravatar.com" 155 msgstr "Troque seu avatar em Gravatar.com"
156 156
157 -#: accounts/templates/accounts/user_update_form.html:126 search/utils.py:8 157 +#: accounts/templates/accounts/user_update_form.html:145 search/utils.py:8
158 msgid "Emails" 158 msgid "Emails"
159 msgstr "E-mails" 159 msgstr "E-mails"
160 160
161 -#: accounts/templates/accounts/user_update_form.html:135 161 +#: accounts/templates/accounts/user_update_form.html:154
162 msgid "Primary" 162 msgid "Primary"
163 msgstr "Primários" 163 msgstr "Primários"
164 164
165 -#: accounts/templates/accounts/user_update_form.html:138 165 +#: accounts/templates/accounts/user_update_form.html:157
  166 +msgid "Setting..."
  167 +msgstr "Definindo..."
  168 +
  169 +#: accounts/templates/accounts/user_update_form.html:157
166 msgid "Set as Primary" 170 msgid "Set as Primary"
167 msgstr "Definir como Primário" 171 msgstr "Definir como Primário"
168 172
169 -#: accounts/templates/accounts/user_update_form.html:139  
170 -#: accounts/templates/accounts/user_update_form.html:151 173 +#: accounts/templates/accounts/user_update_form.html:158
  174 +msgid "Deleting..."
  175 +msgstr "Deletando..."
  176 +
  177 +#: accounts/templates/accounts/user_update_form.html:158
  178 +#: accounts/templates/accounts/user_update_form.html:170
171 msgid "Delete" 179 msgid "Delete"
172 msgstr "Apagar" 180 msgstr "Apagar"
173 181
174 -#: accounts/templates/accounts/user_update_form.html:150 182 +#: accounts/templates/accounts/user_update_form.html:169
  183 +msgid "Sending verification..."
  184 +msgstr "Enviando verificação..."
  185 +
  186 +#: accounts/templates/accounts/user_update_form.html:169
175 msgid "Verify" 187 msgid "Verify"
176 msgstr "Verificar" 188 msgstr "Verificar"
177 189
178 -#: accounts/templates/accounts/user_update_form.html:158 190 +#: accounts/templates/accounts/user_update_form.html:177
179 msgid "Add another email address:" 191 msgid "Add another email address:"
180 msgstr "Adicionar outro endereço de e-mail" 192 msgstr "Adicionar outro endereço de e-mail"
181 193
182 -#: accounts/templates/accounts/user_update_form.html:161 194 +#: accounts/templates/accounts/user_update_form.html:180
183 msgid "Add" 195 msgid "Add"
184 msgstr "Adicionar" 196 msgstr "Adicionar"
185 197
186 -#: accounts/templates/accounts/user_update_form.html:168 198 +#: accounts/templates/accounts/user_update_form.html:187
187 msgid "Update" 199 msgid "Update"
188 msgstr "Atualizar" 200 msgstr "Atualizar"
189 201
@@ -316,11 +328,11 @@ msgstr &quot;Imagem&quot; @@ -316,11 +328,11 @@ msgstr &quot;Imagem&quot;
316 msgid "Spreadsheet" 328 msgid "Spreadsheet"
317 msgstr "Planilha" 329 msgstr "Planilha"
318 330
319 -#: colab/custom_settings.py:261 331 +#: colab/custom_settings.py:263
320 msgid "Planet Colab" 332 msgid "Planet Colab"
321 msgstr "" 333 msgstr ""
322 334
323 -#: colab/custom_settings.py:262 335 +#: colab/custom_settings.py:264
324 msgid "Colab blog aggregator" 336 msgid "Colab blog aggregator"
325 msgstr "Agregador de blog Colab" 337 msgstr "Agregador de blog Colab"
326 338
@@ -836,15 +848,19 @@ msgstr &quot;Meu Perfil&quot; @@ -836,15 +848,19 @@ msgstr &quot;Meu Perfil&quot;
836 msgid "Search here..." 848 msgid "Search here..."
837 msgstr "Pesquise aqui..." 849 msgstr "Pesquise aqui..."
838 850
839 -#: templates/base.html:156 851 +#: templates/base.html:138
  852 +msgid "The login has failed. Please, try again."
  853 +msgstr "O login falhou. Por favor, tente novamente."
  854 +
  855 +#: templates/base.html:163
840 msgid "Last email imported at" 856 msgid "Last email imported at"
841 msgstr "Último e-mail importado em" 857 msgstr "Último e-mail importado em"
842 858
843 -#: templates/base.html:161 859 +#: templates/base.html:168
844 msgid "The contents of this site is published under license" 860 msgid "The contents of this site is published under license"
845 msgstr "O conteúdo deste site está publicado sob a licença" 861 msgstr "O conteúdo deste site está publicado sob a licença"
846 862
847 -#: templates/base.html:163 863 +#: templates/base.html:170
848 msgid "Creative Commons - attribution, non-commercial" 864 msgid "Creative Commons - attribution, non-commercial"
849 msgstr "Creative Commons - atribuição e não-comercial" 865 msgstr "Creative Commons - atribuição e não-comercial"
850 866