Delete old scipost.VGM code

SciPost_v1/urls.py

@@ -31,6 +31,7 @@ urlpatterns = [
     url(r'^submission/', include('submissions.urls', namespace="submissions")),
     url(r'^theses/', include('theses.urls', namespace="theses")),
     url(r'^thesis/', include('theses.urls', namespace="theses")),
+    url(r'^meetings/', include('virtualmeetings.urls', namespace="virtualmeetings")),
     url(r'^news/', include('news.urls', namespace="news")),
 ]
 

scipost/forms.py

@@ -316,59 +316,59 @@ class SPBMembershipForm(forms.ModelForm):
                 css_class="row"),
         )
 
-
-#################
-# VGMs, Motions #
-#################
-
-class FeedbackForm(forms.ModelForm):
-    class Meta:
-        model = Feedback
-        fields = ['feedback']
-
-
-class NominationForm(forms.ModelForm):
-    class Meta:
-        model = Nomination
-        fields = ['first_name', 'last_name',
-                  'discipline', 'expertises', 'webpage']
-
-    def __init__(self, *args, **kwargs):
-        super(NominationForm, self).__init__(*args, **kwargs)
-        self.fields['expertises'].widget = forms.SelectMultiple(choices=SCIPOST_SUBJECT_AREAS)
-
-
-class MotionForm(forms.ModelForm):
-    class Meta:
-        model = Motion
-        fields = ['category', 'background', 'motion']
-
-    def __init__(self, *args, **kwargs):
-        super(MotionForm, self).__init__(*args, **kwargs)
-        self.fields['background'].label = ''
-        self.fields['background'].widget.attrs.update(
-            {'rows': 8, 'cols': 100,
-             'placeholder': 'Provide useful background information on your Motion.'})
-        self.fields['motion'].label = ''
-        self.fields['motion'].widget.attrs.update(
-            {'rows': 8, 'cols': 100,
-             'placeholder': 'Phrase your Motion as clearly and succinctly as possible.'})
-        self.helper = FormHelper()
-        self.helper.layout = Layout(
-            Field('category'),
-            Div(
-                Div(HTML('<p>Background:</p>'),
-                    css_class="col-2"),
-                Div(
-                    Field('background'),
-                    css_class="col-10"),
-                css_class="row"),
-            Div(
-                Div(HTML('<p>Motion:</p>'),
-                    css_class="col-2"),
-                Div(
-                    Field('motion'),
-                    css_class="col-10"),
-                css_class="row"),
-            Submit('submit', 'Submit'),
-        )
+#
+# #################
+# # VGMs, Motions #
+# #################
+#
+# class FeedbackForm(forms.ModelForm):
+#     class Meta:
+#         model = Feedback
+#         fields = ['feedback']
+#
+#
+# class NominationForm(forms.ModelForm):
+#     class Meta:
+#         model = Nomination
+#         fields = ['first_name', 'last_name',
+#                   'discipline', 'expertises', 'webpage']
+#
+#     def __init__(self, *args, **kwargs):
+#         super(NominationForm, self).__init__(*args, **kwargs)
+#         self.fields['expertises'].widget = forms.SelectMultiple(choices=SCIPOST_SUBJECT_AREAS)
+#
+#
+# class MotionForm(forms.ModelForm):
+#     class Meta:
+#         model = Motion
+#         fields = ['category', 'background', 'motion']
+#
+#     def __init__(self, *args, **kwargs):
+#         super(MotionForm, self).__init__(*args, **kwargs)
+#         self.fields['background'].label = ''
+#         self.fields['background'].widget.attrs.update(
+#             {'rows': 8, 'cols': 100,
+#              'placeholder': 'Provide useful background information on your Motion.'})
+#         self.fields['motion'].label = ''
+#         self.fields['motion'].widget.attrs.update(
+#             {'rows': 8, 'cols': 100,
+#              'placeholder': 'Phrase your Motion as clearly and succinctly as possible.'})
+#         self.helper = FormHelper()
+#         self.helper.layout = Layout(
+#             Field('category'),
+#             Div(
+#                 Div(HTML('<p>Background:</p>'),
+#                     css_class="col-2"),
+#                 Div(
+#                     Field('background'),
+#                     css_class="col-10"),
+#                 css_class="row"),
+#             Div(
+#                 Div(HTML('<p>Motion:</p>'),
+#                     css_class="col-2"),
+#                 Div(
+#                     Field('motion'),
+#                     css_class="col-10"),
+#                 css_class="row"),
+#             Submit('submit', 'Submit'),
+#         )

scipost/templates/scipost/VGMs.html

@@ -16,7 +16,7 @@
 
   <ul>
     {% for VGM in VGM_list %}
-    <li><a href="{% url 'scipost:VGM_detail' VGM_id=VGM.id %}">{{ VGM }}</a></li>
+    <li><a href="{% url 'virtualmeetings:VGM_detail' VGM_id=VGM.id %}">{{ VGM }}</a></li>
     {% endfor %}
   </ul>
 

scipost/templates/scipost/personal_page.html

@@ -92,7 +92,7 @@
     <div class="col-12">
         <ul class="personalTabMenu">
             <li><a class="TabItem" id="AccountTab">Account</a></li>
-            {% if 'Editorial Administrators' not in user_groups or 'Advisory Board' not in user_groups or 'Editorial College' not in user_groups or 'Vetting Editors' not in user_groups or 'Ambassadors' not in user_groups or 'Junior Ambassadors' not in user_groups %}
+            {% if 'Editorial Administrators' in user_groups or 'Advisory Board' in user_groups or 'Editorial College' in user_groups or 'Vetting Editors' in user_groups or 'Ambassadors' in user_groups or 'Junior Ambassadors' in user_groups %}
                 <li><a class="TabItem" id="EdActionTab">Editorial Actions</a></li>
             {% endif %}
             <li><a class="TabItem" id="RefereeingTab">Refereeing</a></li>
@@ -283,7 +283,7 @@
             {% if perms.scipost.can_attend_VGMs %}
             <h3>Virtual General Meetings</h3>
             <ul>
-                <li><a href="{% url 'scipost:VGMs' %}">List of VGMs</a></li>
+                <li><a href="{% url 'virtualmeetings:VGMs' %}">List of VGMs</a></li>
             </ul>
             {% endif %}
         </div>

scipost/urls.py

@@ -170,28 +170,28 @@ urlpatterns = [
     url(r'^Fellow_activity_overview$',
         views.Fellow_activity_overview,
         name='Fellow_activity_overview'),
-
-    ############################
-    # Virtual General Meetings #
-    ############################
-    url(r'^VGMs$', views.VGMs, name='VGMs'),
-    url(r'^VGM/(?P<VGM_id>[0-9]+)/$', views.VGM_detail, name='VGM_detail'),
-    url(r'^feedback/(?P<VGM_id>[0-9]+)$',
-        views.feedback, name='feedback'),
-    url(r'^add_remark_on_feedback/(?P<VGM_id>[0-9]+)/(?P<feedback_id>[0-9]+)$',
-        views.add_remark_on_feedback, name='add_remark_on_feedback'),
-    url(r'^nominate_Fellow/(?P<VGM_id>[0-9]+)$',
-        views.nominate_Fellow, name='nominate_Fellow'),
-    url(r'^add_remark_on_nomination/(?P<VGM_id>[0-9]+)/(?P<nomination_id>[0-9]+)$',
-        views.add_remark_on_nomination, name='add_remark_on_nomination'),
-    url(r'^vote_on_nomination/(?P<nomination_id>[0-9]+)/(?P<vote>[AND])$',
-        views.vote_on_nomination, name='vote_on_nomination'),
-    url(r'^put_motion_forward/(?P<VGM_id>[0-9]+)$',
-        views.put_motion_forward, name='put_motion_forward'),
-    url(r'^add_remark_on_motion/(?P<motion_id>[0-9]+)$',
-        views.add_remark_on_motion, name='add_remark_on_motion'),
-    url(r'^vote_on_motion/(?P<motion_id>[0-9]+)/(?P<vote>[AND])$',
-        views.vote_on_motion, name='vote_on_motion'),
+    #
+    # ############################
+    # # Virtual General Meetings #
+    # ############################
+    # url(r'^VGMs$', views.VGMs, name='VGMs'),
+    # url(r'^VGM/(?P<VGM_id>[0-9]+)/$', views.VGM_detail, name='VGM_detail'),
+    # url(r'^feedback/(?P<VGM_id>[0-9]+)$',
+    #     views.feedback, name='feedback'),
+    # url(r'^add_remark_on_feedback/(?P<VGM_id>[0-9]+)/(?P<feedback_id>[0-9]+)$',
+    #     views.add_remark_on_feedback, name='add_remark_on_feedback'),
+    # url(r'^nominate_Fellow/(?P<VGM_id>[0-9]+)$',
+    #     views.nominate_Fellow, name='nominate_Fellow'),
+    # url(r'^add_remark_on_nomination/(?P<VGM_id>[0-9]+)/(?P<nomination_id>[0-9]+)$',
+    #     views.add_remark_on_nomination, name='add_remark_on_nomination'),
+    # url(r'^vote_on_nomination/(?P<nomination_id>[0-9]+)/(?P<vote>[AND])$',
+    #     views.vote_on_nomination, name='vote_on_nomination'),
+    # url(r'^put_motion_forward/(?P<VGM_id>[0-9]+)$',
+    #     views.put_motion_forward, name='put_motion_forward'),
+    # url(r'^add_remark_on_motion/(?P<motion_id>[0-9]+)$',
+    #     views.add_remark_on_motion, name='add_remark_on_motion'),
+    # url(r'^vote_on_motion/(?P<motion_id>[0-9]+)/(?P<vote>[AND])$',
+    #     views.vote_on_motion, name='vote_on_motion'),
 
     ################
     # Publications #

virtualmeetings/urls.py

-
-from django.conf.urls import include, url
-from django.views.generic import TemplateView
+from django.conf.urls import url
 
 from . import views