Browse Source

UserCP was split into extensions.

Ralfp 12 years ago
parent
commit
6dd0f3e684

+ 4 - 0
misago/settings_base.py

@@ -98,6 +98,10 @@ PERMISSION_PROVIDERS = (
 USERCP_EXTENSIONS = (
 USERCP_EXTENSIONS = (
     'misago.usercp.options',
     'misago.usercp.options',
     'misago.usercp.avatar',
     'misago.usercp.avatar',
+    'misago.usercp.signature',
+    'misago.usercp.credentials',
+    'misago.usercp.username',
+    'misago.usercp.blocked',
 )
 )
 
 
 # Name of root urls configuration
 # Name of root urls configuration

+ 0 - 0
misago/usercp/blocked/__init__.py


+ 0 - 0
misago/usercp/blocked/forms.py


+ 5 - 0
misago/usercp/blocked/urls.py

@@ -0,0 +1,5 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('misago.usercp.blocked.views',
+    url(r'^blocked/$', 'blocked', name="usercp_blocked"),
+)

+ 4 - 0
misago/usercp/blocked/usercp.py

@@ -0,0 +1,4 @@
+from django.utils.translation import ugettext_lazy as _
+
+def register_usercp_extension(request):
+    return (('usercp_blocked', _('Blocked Members')),)

+ 9 - 0
misago/usercp/blocked/views.py

@@ -0,0 +1,9 @@
+from misago.authn.decorators import block_guest
+from misago.usercp.template import RequestContext
+
+@block_guest
+def blocked(request):
+    return request.theme.render_to_response('usercp/blocked.html',
+                                            context_instance=RequestContext(request, {
+                                              'tab': 'blocked',
+                                             }));

+ 0 - 0
misago/usercp/credentials/__init__.py


+ 0 - 0
misago/usercp/credentials/forms.py


+ 5 - 0
misago/usercp/credentials/urls.py

@@ -0,0 +1,5 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('misago.usercp.credentials.views',
+    url(r'^credentials/$', 'credentials', name="usercp_credentials"),
+)

+ 4 - 0
misago/usercp/credentials/usercp.py

@@ -0,0 +1,4 @@
+from django.utils.translation import ugettext_lazy as _
+
+def register_usercp_extension(request):
+    return (('usercp_credentials', _('Change E-mail or Password')),)

+ 9 - 0
misago/usercp/credentials/views.py

@@ -0,0 +1,9 @@
+from misago.authn.decorators import block_guest
+from misago.usercp.template import RequestContext
+
+@block_guest
+def credentials(request):
+    return request.theme.render_to_response('usercp/credentials.html',
+                                            context_instance=RequestContext(request, {
+                                              'tab': 'credentials',
+                                             }));

+ 0 - 0
misago/usercp/signature/__init__.py


+ 0 - 0
misago/usercp/signature/forms.py


+ 5 - 0
misago/usercp/signature/urls.py

@@ -0,0 +1,5 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('misago.usercp.signature.views',
+    url(r'^signature/$', 'signature', name="usercp_signature"),
+)

+ 4 - 0
misago/usercp/signature/usercp.py

@@ -0,0 +1,4 @@
+from django.utils.translation import ugettext_lazy as _
+
+def register_usercp_extension(request):
+    return (('usercp_signature', _('Edit Signature')),)

+ 16 - 0
misago/usercp/signature/views.py

@@ -0,0 +1,16 @@
+from misago.authn.decorators import block_guest
+from misago.usercp.template import RequestContext
+
+@block_guest
+def signature(request):
+    # Intercept all requests if we cant use signature
+    if request.user.signature_ban:
+        return request.theme.render_to_response('usercp/signature_banned.html',
+                                                context_instance=RequestContext(request, {
+                                                  'tab': 'signature',
+                                                 }));
+                                                
+    return request.theme.render_to_response('usercp/signature.html',
+                                            context_instance=RequestContext(request, {
+                                              'tab': 'signature',
+                                             }));

+ 1 - 7
misago/usercp/urls.py

@@ -2,13 +2,7 @@ from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls import include, patterns, url
 from django.utils.importlib import import_module
 from django.utils.importlib import import_module
 
 
-urlpatterns = patterns('misago.usercp.views',
-    url(r'^credentials/$', 'credentials', name="usercp_credentials"),
-    url(r'^username/$', 'username', name="usercp_username"),
-    url(r'^signature/$', 'signature', name="usercp_signature"),
-    url(r'^ignored/$', 'ignored', name="usercp_ignored"),
-)
-
+urlpatterns = []
 for extension in settings.USERCP_EXTENSIONS:
 for extension in settings.USERCP_EXTENSIONS:
     urlpatterns += patterns('',
     urlpatterns += patterns('',
         (r'^', include(extension + '.urls')),
         (r'^', include(extension + '.urls')),

+ 0 - 0
misago/usercp/username/__init__.py


+ 0 - 0
misago/usercp/username/forms.py


+ 5 - 0
misago/usercp/username/urls.py

@@ -0,0 +1,5 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('misago.usercp.username.views',
+    url(r'^username/$', 'username', name="usercp_username"),
+)

+ 4 - 0
misago/usercp/username/usercp.py

@@ -0,0 +1,4 @@
+from django.utils.translation import ugettext_lazy as _
+
+def register_usercp_extension(request):
+    return (('usercp_username', _('Change Username')),)

+ 9 - 0
misago/usercp/username/views.py

@@ -0,0 +1,9 @@
+from misago.authn.decorators import block_guest
+from misago.usercp.template import RequestContext
+
+@block_guest
+def username(request):
+    return request.theme.render_to_response('usercp/username.html',
+                                            context_instance=RequestContext(request, {
+                                              'tab': 'username',
+                                             }));

+ 0 - 42
misago/usercp/views.py

@@ -1,42 +0,0 @@
-from django.core.urlresolvers import reverse
-from django.shortcuts import redirect
-from django.utils.translation import ugettext as _
-from misago.authn.decorators import block_guest
-from misago.usercp.template import RequestContext
- 
-@block_guest
-def credentials(request):
-    return request.theme.render_to_response('usercp/credentials.html',
-                                            context_instance=RequestContext(request, {
-                                              'tab': 'credentials',
-                                             }));
-    
- 
-@block_guest
-def username(request):
-    return request.theme.render_to_response('usercp/username.html',
-                                            context_instance=RequestContext(request, {
-                                              'tab': 'username',
-                                             }));  
- 
-@block_guest
-def signature(request):
-    # Intercept all requests if we cant use signature
-    if request.user.avatar_ban:
-        return request.theme.render_to_response('usercp/signature_banned.html',
-                                                context_instance=RequestContext(request, {
-                                                  'tab': 'signature',
-                                                 }));
-                                                
-    return request.theme.render_to_response('usercp/signature.html',
-                                            context_instance=RequestContext(request, {
-                                              'tab': 'signature',
-                                             }));
-    
- 
-@block_guest
-def ignored(request):
-    return request.theme.render_to_response('usercp/ignored.html',
-                                            context_instance=RequestContext(request, {
-                                              'tab': 'ignored',
-                                             }));

+ 2 - 2
templates/sora/usercp/ignored.html → templates/sora/usercp/blocked.html

@@ -3,9 +3,9 @@
 {% load url from future %}
 {% load url from future %}
 {% import "sora/macros.html" as macros with context %}
 {% import "sora/macros.html" as macros with context %}
 
 
-{% block title %}{{ macros.page_title(title=_('Ignored Members List')) }}{% endblock %}
+{% block title %}{{ macros.page_title(title=_('Blocked Members')) }}{% endblock %}
 
 
 {% block action %}
 {% block action %}
 {{ super() }}
 {{ super() }}
-<h2>{% trans %}Ignored Members List{% endtrans %}</h2>
+<h2>{% trans %}Blocked Members List{% endtrans %}</h2>
 {% endblock %}
 {% endblock %}

+ 0 - 5
templates/sora/usercp/layout.html

@@ -14,11 +14,6 @@
         {% for link in tabs %}
         {% for link in tabs %}
         <li{% if link.active %} class="active"{% endif %}><a href="{{ link.route|url }}">{{ link.name }}</a></li>
         <li{% if link.active %} class="active"{% endif %}><a href="{{ link.route|url }}">{{ link.name }}</a></li>
         {% endfor %}
         {% endfor %}
-        <li class="nav-header">Outdated Actions:</li>
-  	    <li{% if tab == 'signature' %} class="active"{% endif %}><a href="{% url 'usercp_signature' %}">{% trans %}Edit Signature{% endtrans %}</a></li>
-  	    <li{% if tab == 'credentials' %} class="active"{% endif %}><a href="{% url 'usercp_credentials' %}">{% trans %}Change E-mail or Password{% endtrans %}</a></li>
-  	    <li{% if tab == 'username' %} class="active"{% endif %}><a href="{% url 'usercp_username' %}">{% trans %}Change Username{% endtrans %}</a></li>
-        <li{% if tab == 'ignored' %} class="active"{% endif %}><a href="{% url 'usercp_ignored' %}">{% trans %}Ignored Members List{% endtrans %}</a></li>
       </ul>
       </ul>
     </div>
     </div>
   </div>
   </div>

+ 1 - 1
templates/sora/usercp/signature.html

@@ -7,5 +7,5 @@
 
 
 {% block action %}
 {% block action %}
 {{ super() }}
 {{ super() }}
-<h2>{% trans %}Change your Signature{% endtrans %}</h2>
+<h2>{% trans %}Edit your Signature{% endtrans %}</h2>
 {% endblock %}
 {% endblock %}