Download as
Browse Code »

Commit 33b19a450fd1460bd3f24d380b6107fb7ef2407a

Authored by Jailson Dias
1 parent 6b44b1e6
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Ajustes na web conferencia

Showing 6 changed files with 22 additions and 21 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @33b19a4
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-03-22 17:37-0300\n"
  11 +"POT-Creation-Date: 2017-03-23 13:53-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -87,8 +87,10 @@ msgid &quot;Theme&quot;
87 87 msgstr "Temas"
88 88  
89 89 #: amadeus/templates/base.html:179
90   -msgid "Web Conference Settings"
91   -msgstr "Configurações da Web conferência"
  90 +#, fuzzy
  91 +#| msgid "Web Conference Settings"
  92 +msgid "Web Conference"
  93 +msgstr "Web conferência"
92 94  
93 95 #: amadeus/templates/base.html:199 amadeus/templates/base.html:254
94 96 msgid "Subjects"
... ...
amadeus/templates/base.html
  Diff comments   View file @33b19a4
... ... @@ -176,7 +176,7 @@
176 176 <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
177 177 <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
178 178 <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
179   - <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference Settings' %}</a></li>
  179 + <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li>
180 180 </ul>
181 181 </div>
182 182 </div>
... ...
webconference/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @33b19a4
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-03-22 17:37-0300\n"
  11 +"POT-Creation-Date: 2017-03-23 13:53-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -62,7 +62,6 @@ msgid &quot;End date/hour&quot;
62 62 msgstr "Data/hora de termino"
63 63  
64 64 #: webconference/models.py:13
65   -#: webconference/templates/webconference/jitsi.html:6
66 65 msgid "Web Conference"
67 66 msgstr "Web Conferência"
68 67  
... ... @@ -122,7 +121,7 @@ msgid &quot;Settings: Conference&quot;
122 121 msgstr "Configurações: Web Conferência"
123 122  
124 123 #: webconference/templates/webconference/create.html:20
125   -#: webconference/views.py:246
  124 +#: webconference/views.py:319
126 125 msgid "Create Web Conference"
127 126 msgstr "Criar Web Conferência"
128 127  
... ... @@ -135,18 +134,18 @@ msgstr &quot;Editar: &quot;
135 134 msgid "Participate"
136 135 msgstr "Participar"
137 136  
138   -#: webconference/views.py:49
  137 +#: webconference/views.py:48 webconference/views.py:93
139 138 #, python-format
140 139 msgid "%s - Web Conference"
141 140 msgstr "%s - Web Conferência"
142 141  
143   -#: webconference/views.py:175 webconference/views.py:187
144   -#: webconference/views.py:306 webconference/views.py:308
145   -#: webconference/views.py:324 webconference/views.py:326
  142 +#: webconference/views.py:247 webconference/views.py:259
  143 +#: webconference/views.py:377 webconference/views.py:379
  144 +#: webconference/views.py:395 webconference/views.py:397
146 145 msgid "Visualize"
147 146 msgstr "Visualizar"
148 147  
149   -#: webconference/views.py:257
  148 +#: webconference/views.py:330
150 149 #, fuzzy, python-format
151 150 #| msgid ""
152 151 #| "The Web conference '%s' was added to the Topic '%s' of the virtual "
... ... @@ -158,17 +157,17 @@ msgstr &quot;&quot;
158 157 "A web conferência '%s' foi adicionada ao tópico '%s' do ambiente virtual "
159 158 "'%s' com sucesso!"
160 159  
161   -#: webconference/views.py:370
  160 +#: webconference/views.py:441
162 161 msgid "Update Web Conference"
163 162 msgstr "Atualizar a web conferência"
164 163  
165   -#: webconference/views.py:381
  164 +#: webconference/views.py:452
166 165 #, fuzzy, python-format
167 166 #| msgid "Security settings updated successfully!"
168 167 msgid "The Web conference \"%s\" was updated successfully!"
169 168 msgstr "A web conferência '%s' foi atualizada com sucesso!"
170 169  
171   -#: webconference/views.py:419
  170 +#: webconference/views.py:488
172 171 #, python-format
173 172 msgid ""
174 173 "The web conference \"%s\" was removed successfully from virtual environment "
... ... @@ -176,13 +175,13 @@ msgid &quot;&quot;
176 175 msgstr ""
177 176 "A web conferência '%s' foi removida com sucesso do ambiente virtual '%s'!"
178 177  
179   -#: webconference/views.py:453
  178 +#: webconference/views.py:522
180 179 #, fuzzy
181 180 #| msgid "Security settings updated successfully!"
182 181 msgid "Conference settings updated successfully!"
183 182 msgstr "Configurações de segurança atualizadas com sucesso!"
184 183  
185   -#: webconference/views.py:460
  184 +#: webconference/views.py:529
186 185 #, fuzzy
187 186 #| msgid "Conference Setting"
188 187 msgid "Web Conference Settings"
... ...
webconference/templates/webconference/jitsi.html
  Diff comments   View file @33b19a4
... ... @@ -60,7 +60,7 @@
60 60 var repeater = setInterval(function () {
61 61 $.ajax({
62 62 method: "GET",
63   - url: "{% url 'webconferences:participando'%}",
  63 + url: "{% url 'webconferences:participating'%}",
64 64 dataType: 'json',
65 65 data: {'slug':'{{name_room}}'},
66 66 success: function(response) {
... ...
webconference/urls.py
  Diff comments   View file @33b19a4
... ... @@ -12,6 +12,6 @@ urlpatterns = [
12 12 url(r'^view/(?P<slug>[\w_-]+)/$', views.InsideView.as_view(), name = 'view'),
13 13 url(r'^conference/(?P<slug>[\w_-]+)/$',views.Conference.as_view(), name = 'conference'),
14 14 url(r'^finish/$',views.finish, name = 'exit'),
15   - url(r'^participando/$',views.participando, name = 'participando'),
  15 + url(r'^participating/$',views.participating, name = 'participating'),
16 16 url(r'^settings/$', views.ConferenceSettings.as_view(), name = 'settings'),
17 17 ]
... ...
webconference/views.py
  Diff comments   View file @33b19a4
... ... @@ -120,8 +120,8 @@ class Conference(LoginRequiredMixin,LogMixin,generic.TemplateView):
120 120  
121 121 return context
122 122  
123   -@log_decorator('resources', 'participando', 'webconference')
124   -def participando(request):
  123 +@log_decorator('resources', 'participating', 'webconference')
  124 +def participating(request):
125 125 webconference = get_object_or_404(Webconference, slug = request.GET['slug'])
126 126 log_context = {}
127 127 log_context['category_id'] = webconference.topic.subject.category.id
... ...