Merge 6351538 into 64e3f54

LibraryOfCongress · Mar 11, 2019 · a79d58f · a79d58f
2 parents 64e3f54 + 6351538
commit a79d58f
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 93 deletions.
diff --git a/Pipfile b/Pipfile
@@ -42,6 +42,7 @@ cfn-lint = "*"
 django-celery-beat = "*"
 django-passwords = "*"
 kombu = ">=4.2.2<4.3.0"
+django-flags = "*"
 
 [dev-packages]
 invoke = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/concordia/settings_template.py b/concordia/settings_template.py
@@ -78,6 +78,7 @@
     "django_prometheus_metrics",
     "robots",
     "django_celery_beat",
+    "flags",
 ]
 
 MIDDLEWARE = [
@@ -93,6 +94,7 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "maintenance_mode.middleware.MaintenanceModeMiddleware",
     "ratelimit.middleware.RatelimitMiddleware",
+    "flags.middleware.FlagConditionsMiddleware",
 ]
 
 RATELIMIT_VIEW = "concordia.views.ratelimit_view"
@@ -304,3 +306,6 @@
 
 #: Web cache policy settings
 DEFAULT_PAGE_TTL = 5 * 60
+
+# Feature flag for social share
+FLAGS = {"SOCIAL_SHARE": []}
diff --git a/concordia/templates/transcriptions/asset_detail.html b/concordia/templates/transcriptions/asset_detail.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load staticfiles %}
-
 {% load concordia_media_tags %}
 
 {% block title %}
@@ -67,13 +66,14 @@
                 </div>
             </div>
 
-
-            <div class="btn-group btn-group-sm" role="navigation" aria-label="Links to share this page">
-                <a class="btn btn-default" target="_blank" role="button" title="Share this page on Facebook" href="https://www.facebook.com/share.php?u={{ share_url|urlencode:"" }}"><span class="facebook-icon"></span></a>
-                <a class="btn btn-default" target="_blank" role="button" title="Share this page on Twitter" href="https://twitter.com/intent/tweet?text={{ tweet_text|urlencode:"" }}&source=webclient"><span class="twitter-icon"></span></a>
-                <a class="btn btn-default" id="copy-url-button" role="button" data-toggle="tooltip"  data-trigger="manual"  data-placement="bottom" aria-label="Copy this link to your clipboard"><i class="fas fa-link text-white"></i></a>
-                <input type="text" tabindex="-1" aria-hidden="true" class="d-none" id="currentAssetUrl" name="currentAssetUrl" value="{{ current_asset_url }}" />
-            </div>
+            {% if social_share_flag %}
+                <div class="btn-group btn-group-sm" role="navigation" aria-label="Links to share this page">
+                    <a class="btn btn-default" target="_blank" role="button" title="Share this page on Facebook" href="https://www.facebook.com/share.php?u={{ share_url|urlencode:"" }}"><span class="facebook-icon"></span></a>
+                    <a class="btn btn-default" target="_blank" role="button" title="Share this page on Twitter" href="https://twitter.com/intent/tweet?text={{ tweet_text|urlencode:"" }}&source=webclient"><span class="twitter-icon"></span></a>
+                    <a class="btn btn-default" id="copy-url-button" role="button" data-toggle="tooltip"  data-trigger="manual"  data-placement="bottom" aria-label="Copy this link to your clipboard"><i class="fas fa-link text-white"></i></a>
+                    <input type="text" tabindex="-1" aria-hidden="true" class="d-none" id="currentAssetUrl" name="currentAssetUrl" value="{{ current_asset_url }}" />
+                </div>
+            {% endif %}
 
             {% if asset.resource_url %}
                 <div class="btn-group btn-group-sm ml-2" role="navigation" aria-label="Link to the original source for this item">