Ajustes na web conferencia

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