Sync changes from production server

4441

@@ -0,0 +1 @@
+{"id":4441,"url":"https:\/\/pennstreaty.haverford.edu\/qi\/api\/files\/4441","file_urls":{"original":"https:\/\/pennstreaty.haverford.edu\/qi\/files\/original\/3a97a282ba7c2781b2f96aba21e99e90.jpg","fullsize":"https:\/\/pennstreaty.haverford.edu\/qi\/files\/fullsize\/3a97a282ba7c2781b2f96aba21e99e90.jpg","thumbnail":"https:\/\/pennstreaty.haverford.edu\/qi\/files\/thumbnails\/3a97a282ba7c2781b2f96aba21e99e90.jpg","square_thumbnail":"https:\/\/pennstreaty.haverford.edu\/qi\/files\/square_thumbnails\/3a97a282ba7c2781b2f96aba21e99e90.jpg"},"added":"2015-03-20T15:37:42+00:00","modified":"2015-03-20T15:37:44+00:00","filename":"3a97a282ba7c2781b2f96aba21e99e90.jpg","authentication":"e81a92f156b35c2dcb01f7a7058d100f","has_derivative_image":true,"mime_type":"image\/jpeg","order":null,"original_filename":"http:\/\/libdev.haverford.edu\/journalimages\/indian_journals\/swayne\/975_JoelSwayne_1.jpg","size":2979759,"stored":true,"type_os":"JPEG image data, EXIF standard","metadata":{"mime_type":"image\/jpeg","video":{"dataformat":"jpg","lossless":false,"bits_per_sample":24,"pixel_aspect_ratio":1,"resolution_x":3415,"resolution_y":4896,"compression_ratio":0.059405652207198},"iptc":{"IPTCEnvelope":{"CodedCharacterSet":["\u001b%G","\u001b%G"]},"IPTCApplication":{"ApplicationRecordVersion":["\u0000\u0000"],"By-line":["1996-2004 AccuSoft Co., All righ"]}},"jpg":{"exif":{"FILE":{"FileName":"3a97a282ba7c2781b2f96aba21e99e90.jpg","FileDateTime":1426865862,"FileSize":2979759,"FileType":2,"MimeType":"image\/jpeg","SectionsFound":"ANY_TAG, IFD0, THUMBNAIL, EXIF"},"COMPUTED":{"html":"width=\"3415\" height=\"4896\"","Height":4896,"Width":3415,"IsColor":1,"ByteOrderMotorola":0,"Thumbnail.FileType":2,"Thumbnail.MimeType":"image\/jpeg"},"IFD0":{"ImageWidth":3415,"ImageLength":4896,"BitsPerSample":[8,8,8],"Compression":1,"PhotometricInterpretation":2,"Orientation":1,"SamplesPerPixel":3,"XResolution":600,"YResolution":600,"PlanarConfiguration":1,"ResolutionUnit":2,"Software":"Adobe Photoshop CS6 (Windows)","DateTime":"2015:02:20 11:29:42","Artist":"1996-2004 AccuSoft Co., All rights reserved","Exif_IFD_Pointer":312},"THUMBNAIL":{"Compression":6,"XResolution":72,"YResolution":72,"ResolutionUnit":2,"JPEGInterchangeFormat":450,"JPEGInterchangeFormatLength":5713},"EXIF":{"ColorSpace":65535,"ExifImageWidth":3415,"ExifImageLength":4896}}}},"item":{"id":2641,"url":"https:\/\/pennstreaty.haverford.edu\/qi\/api\/items\/2641","resource":"items"},"element_texts":[],"extended_resources":[]}

pull_script

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+django_manage () {
+  /usr/local/lib/python-virtualenv/QI/bin/python manage.py "$@"
+}
+
+echo -e "=== Pulling latest commits ==="
+git pull origin master
+echo -e "\n\n=== Applying database migrations ==="
+django_manage migrate
+echo -e "\n\n=== Restarting uWSGI ==="
+service uwsgi restart

static/css/app.css

@@ -10024,6 +10024,7 @@ button, .button:visited {
   font-family: "Alegreya Sans SC";
   color: #6B737D;
   font-size: 2rem;
+  text-align: center;
 
 }
 

static/import_export/action_formats.js

@@ -0,0 +1,22 @@
+(function($) {
+  $(document).on('ready', function() {
+    var $actionsSelect, $formatsElement;
+    if ($('body').hasClass('grp-change-list')) {
+        // using grappelli
+        $actionsSelect = $('#grp-changelist-form select[name="action"]');
+        $formatsElement = $('#grp-changelist-form select[name="file_format"]');
+    } else {
+        // using default admin
+        $actionsSelect = $('#changelist-form select[name="action"]');
+        $formatsElement = $('#changelist-form select[name="file_format"]').parent();
+    }
+    $actionsSelect.on('change', function() {
+      if ($(this).val() === 'export_admin_action') {
+        $formatsElement.show();
+      } else {
+        $formatsElement.hide();
+      }
+    });
+    $actionsSelect.change();
+  });
+})(django.jQuery);

templates/credits.html

@@ -43,31 +43,35 @@ <h1>Credits</h1>
 <div class='row'>
   <div class=well>
 
-<h3>Student Curators</h3>
-
-<p><b>Claire Michel (’18)</b> is a Psychology Major and Economics Minor at Haverford College.
-  She worked on creating the maps for the website using Carto (formerly Cartodb), </p>
-<hr>
-
-<p><b>Becky Lytle ('18)</b> is a Computer Science major at Haverford College.  She created the
-  document-viewer along with the profiles for the people, places, and groups.  She also implemented a search
-  feature using Django-Haystack and Solr.</p> 
-</p>
-
+<h3>Student Contributors</h3>
+
+
+<p><b>Rebecca H. Astatke</b>, Swarthmore College </p>
+<p><b>Corey Branch</b>, Swarthmore College </p>
+<p><b>Cara Ehlenfeld</b>, Swarthmore College </p>
+<p><b>Constance Hawley</b>, Swarthmore College </p>
+<p><b>Conor Heins</b>, Swarthmore College </p>
+<p><b>Aaron Kroeber</b>, Swarthmore College </p>
+<p><b>Xavier Lee</b>, Swarthmore College </p>
+<p><b>Shane Loeffler</b>, Swarthmore College </p>
+<p><b>Becky Lytle</b>, Haverford College </p>
+<p><b>Claire Michel</b>, Haverford College </p>
+<p><b>Mary Olesnavich</b>, Swarthmore College </p>
+<p><b>Emma Remsberg</b>, Swarthmore College </p>
+<p><b>Julian Turner</b>, Swarthmore College </p>
+<p><b>Yuchao Wang</b>, Haverford College</p>
 <br>
-<h3>Other Contributors</h3>
+<h3>Supporting Staff</h3>
+
+<p><b>Chris Densmore</b>, Curator, Friends Historical Library (retired)</p>
 
 <p><b>Sarah Horowitz</b>, Head of Quaker &amp; Special Collections, Haverford College</p>
-<hr>
 
 <p><b>Andy Janco</b>, Digital Scholarship Librarian, Haverford College</p>
-<hr>
 
 <p><b>Pat O'Donnell</b>, Archivist, Friends Historical Library</p>
-<hr>
 
 <p><b>Emily Thaisrivongs</b>, Metadata Librarian, Haverford College</p>
-<hr>
 
 <p><b>Mike Zarafonetis</b>, Coordinator of Digital Scholarship and Research Services, Haverford College</p>
 

templates/index.html

@@ -26,6 +26,7 @@ <h1> Beyond Penn's Treaty: Quaker and American Indian Relations</h1>
     <p><font size="3">William Penn’s original intention to treat American Indians fairly in land “sharing” was soon overridden by the land hunger of Europeans. Different notions of land “use” and “ownership” became ever more critical as the two groups struggled to find ways to co-exist. Nevertheless, part of Penn’s vision lived on in the memory and policies of a community of Quakers who maintained—and continuously updated—a commitment to American Indians.</p>
     <p><font size="3"><i>Beyond Penn's Treaty</i>: Quakers and American Indian Relations provides access to linked and annotated versions of Quaker diaries, letters, and meeting records which record contact with American Indians, particularly the Seneca, beginning in the 1740s. These documents, held in Quaker &amp; Special Collections at Haverford College and Friends Historical Library at Swarthmore College, are all from the Quaker perspective, and document their view of this unfolding relationship. </p>
     <p><font size="3">This site allows users to search for people, organizations, and places within a variety of documents; view maps of travel routes and common locations; and transcribe documents. The transcribed text versions of these documents and the metadata spreadsheets are available for download and reuse.</p>
+    <p><font size="3">Funding for the inclusion of some items on this site was provided by the <a href="https://oieahc.wm.edu/fellowships/digital-collections-fellowships/">Lapidus Initiative Fellowship For Digital Collections</a> from the <a href="https://oieahc.wm.edu">Omohundro Institute of Early American History and Culture.</a></p>
     <br />
 
    </div>

templates/story_mapsSW_GH1804.html

@@ -0,0 +1,50 @@
+{% load staticfiles %}
+			<!doctype html>
+<html class="no-js" lang="en">
+  <head>
+    {% include 'top-links.html' %}
+    <title>SW_GH1804 StoryMapJS </title>
+    <link rel="stylesheet" href="https://cdn.knightlab.com/libs/storymapjs/latest/css/storymap.css">
+
+  </head>
+  <body>
+	{% include 'header.html' %}
+   <div id = "row1">
+  <!--     Navigation Menu Below:  -->
+    {% include 'nav.html' %}
+  </div>
+	<div id = "story1" style = "background-color: #F0F8FF;">
+	   <div>
+	      <br />
+	      <h2 class = "text-center" style = "font-family: 'Alegreya Sans SC'; font-weight: 400; color: black"> StoryMap for SW_GH1804</h2>
+	        <!-- The StoryMap container can go anywhere on the page. Be sure to 
+    specify a width and height.  The width can be absolute (in pixels) or 
+    relative (in percentage), but the height must be an absolute value.  
+    Of course, you can specify width and height with CSS instead -->
+    <div id="mapdiv" style="width: 90%; height: 600px; margin:auto"></div> 
+    <br />
+    <br />
+	  </div>  
+	</div>
+  	{% include 'footer.html' %}
+
+ {% include 'bottom-links.html' %}
+  <!-- Your script tags should be placed before the closing body tag. -->
+    <script type="text/javascript" src="https://cdn.knightlab.com/libs/storymapjs/latest/js/storymap-min.js"></script>
+     <script>
+  // storymap_data can be an URL or a Javascript object
+
+      //var storymap_data = "{% static "json/StoryMapData.json" %}"; 
+      var storymap_data = "{% static "json/SW_GH1804.json" %}"; 
+
+      // certain settings must be passed within a separate options object
+      var storymap_options = {};
+      var storymap = new VCO.StoryMap('mapdiv', storymap_data, storymap_options);
+      window.onresize = function(event) {
+          storymap.updateDisplay(); // this isn't automatic
+      }          
+  </script>
+
+
+  </body>
+</html>

templates/top-links.html

@@ -5,6 +5,14 @@
     <link rel="stylesheet" href="{% static 'css/font-awesome/css/font-awesome.min.css' %}" />
     <link href='https://fonts.googleapis.com/css?family=Alegreya+Sans+SC:400,100|Josefin+Sans:400,100|Berkshire+Swash|EB+Garamond|Libre+Baskerville|Special+Elite|Open+Sans:300,400' rel='stylesheet' type='text/css'>
     <script src="{% static "js/modernizr/modernizr.js" %}"></script>
-
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-45185227-17"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-45185227-17');
+</script> 
 
 

uwsgi_params

@@ -0,0 +1,15 @@
+uwsgi_param     QUERY_STRING            $query_string;
+uwsgi_param     REQUEST_METHOD          $request_method;
+uwsgi_param     CONTENT_TYPE            $content_type;
+uwsgi_param     CONTENT_LENGTH          $content_length;
+
+uwsgi_param     REQUEST_URI             $request_uri;
+uwsgi_param     PATH_INFO               $document_uri;
+uwsgi_param     DOCUMENT_ROOT           $document_root;
+uwsgi_param     SERVER_PROTOCOL         $server_protocol;
+uwsgi_param     UWSGI_SCHEME            $scheme;
+
+uwsgi_param     REMOTE_ADDR             $remote_addr;
+uwsgi_param     REMOTE_PORT             $remote_port;
+uwsgi_param     SERVER_PORT             $server_port;
+uwsgi_param     SERVER_NAME             $server_name;