Просмотр исходного кода

connected user cp to pages feature for extensibility

Rafał Pitoń 9 лет назад
Родитель
Сommit
2e58ae4a5e

+ 1 - 1
frontend/src/components/options/sign-in-credentials.js

@@ -256,7 +256,7 @@ export class ChangePassword extends Form {
 export default class extends React.Component {
   componentDidMount() {
     title.set({
-      title: gettext("Change sign-in credentials"),
+      title: gettext("Change email or password"),
       parent: gettext("Change your options")
     });
   }

+ 7 - 15
misago/users/apps.py

@@ -19,29 +19,21 @@ class MisagoUsersConfig(AppConfig):
 
         usercp.add_section(
             link='misago:usercp_change_forum_options',
-            name=_('Change forum options'),
-            icon='fa fa-check-square-o')
-
-        usercp.add_section(
-            link='misago:usercp_change_avatar',
-            name=_('Change avatar'),
-            icon='fa fa-image')
-
-        usercp.add_section(
-            link='misago:usercp_edit_signature',
-            name=_('Edit your signature'),
-                        icon='fa fa-pencil',
-            visible_if=show_signature_cp)
+            name=_('Forum options'),
+            component='forum-options',
+            icon='settings')
 
         usercp.add_section(
             link='misago:usercp_change_username',
             name=_('Change username'),
-            icon='fa fa-credit-card')
+            component='change-username',
+            icon='card_membership')
 
         usercp.add_section(
             link='misago:usercp_change_email_password',
             name=_('Change email or password'),
-            icon='fa fa-ticket')
+            component='sign-in-credentials',
+            icon='vpn_key')
 
     def register_default_users_list_pages(self):
         def can_see_online_list(request):

+ 5 - 0
misago/users/urls/__init__.py

@@ -27,6 +27,11 @@ urlpatterns += patterns('misago.users.views.forgottenpassword',
 urlpatterns += patterns('misago.users.views.options',
     url(r'^options/$', 'index', name='options'),
     url(r'^options/(?P<form_name>[-a-zA-Z]+)/$', 'index', name='options_form'),
+
+    url(r'^options/forum-options/$', 'index', name='usercp_change_forum_options'),
+    url(r'^options/change-username/$', 'index', name='usercp_change_username'),
+    url(r'^options/sign-in-credentials/$', 'index', name='usercp_change_email_password'),
+
     url(r'^options/change-email/(?P<token>[a-zA-Z0-9]+)/$', 'confirm_email_change', name='options_confirm_email_change'),
     url(r'^options/change-password/(?P<token>[a-zA-Z0-9]+)/$', 'confirm_password_change', name='options_confirm_password_change'),
 )

+ 10 - 18
misago/users/views/options.py

@@ -6,30 +6,22 @@ from django.utils.translation import ugettext as _
 
 from misago.users.credentialchange import read_new_credential
 from misago.users.decorators import deny_guests
+from misago.users.pages import usercp
 
 
 @deny_guests
 def index(request, *args, **kwargs):
+    user_options = []
+    for section in usercp.get_sections(request):
+        user_options.append({
+            'name': unicode(section['name']),
+            'icon': section['icon'],
+            'component': section['component'],
+        })
+
     request.frontend_context.update({
         'USERNAME_CHANGES_API': reverse('misago:api:usernamechange-list'),
-
-        'USER_OPTIONS': [
-            {
-                'name': _("Forum options"),
-                'icon': 'settings',
-                'component': 'forum-options',
-            },
-            {
-                'name': _("Change username"),
-                'icon': 'card_membership',
-                'component': 'change-username',
-            },
-            {
-                'name': _("Change sign-in credentials"),
-                'icon': 'vpn_key',
-                'component': 'sign-in-credentials',
-            },
-        ]
+        'USER_OPTIONS': user_options
     });
 
     return render(request, 'misago/options/noscript.html')