Hide emails in production site.

uchicago-sg · Jan 13, 2016 · 8542076 · 8542076
1 parent 89eee2f
commit 8542076
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 73 deletions.
diff --git a/caravel/__init__.py b/caravel/__init__.py
@@ -31,6 +31,7 @@
 CsrfProtect(app)
 
 # Imported for side effects:
+import caravel.storage.config
 import caravel.controllers.listings
 import caravel.controllers.api
 import caravel.controllers.moderation

diff --git a/caravel/templates/listing_form.html b/caravel/templates/listing_form.html
@@ -17,12 +17,11 @@
           {% if form.principal %}
             {{ wtf.form_field(form.principal) }}
           {% endif %}
-					<div class="alert alert-warning" role="alert">
-          	BSD/Medicine/Medical School affiliates: if you are unable to sign
-            in with your CNetID, please enter your email in the box. Your
-            listing might not be posted immediately. We reserve the right to
-            remove listings at any time.
-					</div>
+          <p class="alert alert-warning" role="alert">
+             Alumni/BSD/Medicine/Medical School affiliates: if you are unable
+             to sign in with your CNetID, please enter your email in the box.
+             Your listing might not be posted immediately. We reserve the right
+             to remove listings at any time.</p>
           {{ wtf.form_field(form.categories) }}
           {{ wtf.form_field(form.price) }}
           {{ wtf.form_field(form.body) }}

diff --git a/caravel/templates/listings/fullpage.html b/caravel/templates/listings/fullpage.html
@@ -23,14 +23,14 @@ <h2>{{ listing.title }}</h2>
           <span class="label label-default">{{ category }}</span>
         {% endfor %}
       </p>
-      <p>Posted <strong>{{ listing.posted_at|as_duration }}</strong>
-          by {% if current_user %}
+      <p>Posted <strong>{{ listing.posted_at|as_duration }}</strong>.
+          {# by {% if current_user %}
             <a href="{{ url_for('search_listings',
                           q=listing.principal.email) }}">
               {{ listing.principal.email }}</a>
           {%- else -%}
             [address hidden] (<a href="{{ login_url() }}">sign in</a> to view)
-          {%- endif -%}.
+          {%- endif -%}. #}
           Price: <strong>{{ '${:,.2f}'.format(listing.price) }}</strong>
       </p>
       {% if is_admin %}

diff --git a/caravel/templates/listings/thumbnail.html b/caravel/templates/listings/thumbnail.html
@@ -27,9 +27,9 @@ <h3>
         {% for category in listing.categories %}
         <span class="label label-default">{{ category }}</span>
         {% endfor %}<br/>
-        {% if current_user %}
+        {# }{% if current_user %}
           <span class="label label-primary">{{ listing.principal.email }}</span>
-        {% endif %}
+        {% endif %} #}
         <span class="label label-info">{{
           listing.posted_at|as_duration }}</span>
       </p>

diff --git a/caravel/tests/helper.py b/caravel/tests/helper.py
@@ -94,7 +94,8 @@ def clean(self, markup):
         markup = re.sub(r'Marketplace is.*lists.uchicago.edu\. ', '', markup)
         markup = re.sub(r'(^.*UChicago Marketplace)|(&#169;.*$)', '', markup)
         markup = re.sub(r'Please .* Update to Marketplace \. ', '', markup)
-	markup = re.sub(r'tip: .*? listings ', '', markup)
+        markup = re.sub(r'tip: .*? listings ', '', markup)
+        markup = re.sub(r'Alumni/BSD.*?any time\. ', '', markup)
         return markup.strip()
 
     def extract_photos(self, markup):