symposion_app Changeset - ecabf31e54b9

Changeset - ecabf31e54b9

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Christopher Neugebauer - 8 years ago 2016-07-09 13:14:31
_@chrisjrn.com

Assorted fixes (#47)

* Invokes the site tree fix from previous fixes.

* Adds a disclaimer noting that previous years’ accounts have not been carried over.

Fixes #43

* Adds proposal type to the proposal summary page.

Fixes #40

* Adds travel/accommodation assistance to the proposals page, but makes it only visible to speakers in the proposal, or review managers.

Fixes #41.
Fixes #42.

* Reduces a lot of the whitespace in the header and footer.

Fixes #44

* Proposals review page now shows information for every speaker on a proposal.

Fixes #45

* Makes sure that non_field_errors are displayed by forms.

Fixes #37

6 files changed with 77 insertions and 12 deletions:

pinaxcon/monkey_patch.py

pinaxcon/templates/_form_snippet.html

pinaxcon/templates/account/login.html

pinaxcon/templates/symposion/proposals/_proposal_fields.html

pinaxcon/templatetags/lca2017_tags.py

static/src/lca2017/css/app.css

0 comments (0 inline, 0 general)

pinaxcon/monkey_patch.py

➞

Show inline comments

...		@@ -15,2 +15,3 @@ def do_monkey_patch():
		patch_accounts_to_send_bcc()
		fix_sitetree_check_access_500s()

pinaxcon/templates/_form_snippet.html

➞

Show inline comments

@@ ... / @@ -2,2 +2,7 @@ @@
 {% if form.non_field_errors %}
   {{ form.non_field_errors }}
   <br/>
 {% endif %}
 {% for field in form %}

pinaxcon/templates/account/login.html

➞

Show inline comments

@@ ... / @@ -16,2 +16,6 @@ @@
   {% endif %}
       <p>
         {% trans "Accounts from previous years have not been carried over to this site." %}
         {% trans "You will need to create a new account for this year's site." %}
       </p>

pinaxcon/templates/symposion/proposals/_proposal_fields.html

➞

Show inline comments

 {% load i18n %}
 {% load lca2017_tags %}
@@ ... / @@ -5,2 +6,5 @@ @@
     <h4>{% trans "Proposal Type" %}</h4>
     <p>{{ proposal.kind.name|capfirst }}</p>
     <h4>{% trans "Target Audience" %}</h4>
@@ ... / @@ -42,10 +46,44 @@ @@
     <h4>{% trans "Speaker Bio" %}</h4>
     <div class="biography">{{ proposal.speaker.biography_html|safe }}&nbsp;</div>
     {% for speaker in proposal.speakers %}
       <h4>{% trans "Speaker:" %} {{ speaker.name }}</h4>
       <h5>{% trans "Biography" %}</h5>
       <div class="biography">{{ proposal.speaker.biography_html|safe }}&nbsp;</div>
       <h5>{% trans "Experience" %}</h5>
       <div class="biography">{{ proposal.speaker.experience_html|safe }}&nbsp;</div>
     {% endfor %}
     {% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %}
     <h4>{% trans "Speaker Experience" %}</h4>
     <div class="biography">{{ proposal.speaker.experience_html|safe }}&nbsp;</div>
       <h4>{% trans "Assistance required?" %}</h4>
       <br />
       <table>
         <tr>
           <th></th>
           <th>{% trans "Travel" %}</th>
           <th>{% trans "Accommodation" %}</th>
         </tr>
         {% for speaker in proposal.speakers %}
           <tr>
             <td>{{ speaker.name }}</td>
             <td>{{ speaker.travel_assistance }}</td>
             <td>{{ speaker.accommodation_assistance }}</td>
           </tr>
         {% endfor %}
       </table>
       <br />
       {% if proposal.speaker.accessibility_html %}
         <h4>{% trans "Speaker Accessibility Requirements" %}</h4>
         {% for speaker in proposal.speakers %}
           {% if speaker.accessibility_html %}
             <h5>{{ speaker.name }}</h5>
             <div class="biography">{{ speaker.accessibility_html|safe }}&nbsp;</div>
           {% endif %}
         {% endfor %}
       {% endif %}
     {% endif %}
     <h4>{% trans "Speaker Accessibility Requirements" %}</h4>
     <div class="biography">{{ proposal.speaker.accessibility_html|safe }}&nbsp;</div>

pinaxcon/templatetags/lca2017_tags.py

➞

Show inline comments

@@ ... / @@ -6 +6,14 @@ def classname(ob): @@
     return ob.__class__.__name__
 @register.simple_tag(takes_context=True)
 def can_manage(context, proposal):
     return proposal_permission(context, "manage", proposal)
 @register.simple_tag(takes_context=True)
 def can_review(context, proposal):
     return proposal_permission(context, "review", proposal)
 def proposal_permission(context, permname, proposal):
     slug = proposal.kind.section.slug
     perm = "reviews.can_%s_%s" % (permname, slug)
     return context.request.user.has_perm(perm)

static/src/lca2017/css/app.css

➞

Show inline comments

@@ ... / @@ -1377,3 +1377,3 @@ table.alt tr:not(:last-of-type) { @@
   .l-header {
     margin-top: 6.25rem;
+    /*margin-top: 6.25rem;  /* issue #44. We don't like this. */
+  }
@@ ... / @@ -1432,3 +1432,3 @@ table.alt tr:not(:last-of-type) { @@
   margin-top: 100px;
-  margin-top: 6.25rem;
+  margin-top: 3.25rem;
   padding: 50px 40px;
@@ ... / @@ -1468,3 +1468,4 @@ table.alt tr:not(:last-of-type) { @@
   .l-footer {
     padding: 6.25rem 70px;
     /*padding: 6.25rem 70px; /* issue #44 too much padding */
     padding: 3.25rem 70px;
     -ms-flex-direction: row;
@@ ... / @@ -1481,3 +1482,4 @@ table.alt tr:not(:last-of-type) { @@
   .l-footer {
     padding: 6.25rem 160px;
     /*padding: 6.25rem 160px; */
     padding: 3.25rem 160px;
+  }
@@ ... / @@ -1487,3 +1489,4 @@ table.alt tr:not(:last-of-type) { @@
   .l-footer {
     padding: 6.25rem 200px;
     /*padding: 6.25rem 200px;*/
     padding: 3.25rem 200px;
+  }
@@ ... / @@ -1498,3 +1501,4 @@ table.alt tr:not(:last-of-type) { @@
   .l-footer {
     padding: 6.25rem auto;
     padding: 3.25rem auto;
     /*padding: 6.25rem auto;*/
+  }

0 comments (0 inline, 0 general)