Merge branch 'release/v1.0.5'

CentreForCorpusResearch · Jun 7, 2015 · 8d145bf · 8d145bf
2 parents 45358e2 + 8ae76d3
commit 8d145bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/clic/web/static/img/AHRC10th_vert_RGB.png b/clic/web/static/img/AHRC10th_vert_RGB.png
diff --git a/clic/web/templates/about.html b/clic/web/templates/about.html
@@ -10,25 +10,25 @@
   <div class="row">
       <div class="col-sm-9">
           <h2 class="without-pills">About this prototype</h2>
-          
-          <p>The CLiC interface is work in progress. This prototype was last updated on 22/05/2015 (version 1.0.4).
+
+          <p>The CLiC interface is work in progress. This prototype was last updated on 8/6/2015 (version 1.0.5).
           This update makes it possible to click on one of the rows in the concordance to retrieve the text it was
-          found in. Also it speeds up certain searches considerably. Other searches might still be a slow 
+          found in. Also it speeds up certain searches considerably. Other searches might still be a slow
           and very complex searches may fail.</p>
-          
+
           <p>The following search options are in full development:</p>
           <ul>
               <li>Searches in short suspensions</li>
               <li>Searches in 1-grams and 2-grams.</li>
           </ul>
       </div>
-    
+
       <div class="col-sm-3 padded">
           <div class="sideHead">
               <i class="fa fa-comment-o fa-4x"></i>
               <h4>Feedback</h4>
           </div>
-          
+
           <div class="sideContent">
               <p>We are very keen to hear about:</p>
               <ul>
@@ -37,8 +37,8 @@ <h4>Feedback</h4>
                   <li>What you like</li>
                   <li>What you don't like</li>
               </ul>
-            
-              <p>Please email <a href="mailto:[email protected]">[email protected]</a>.</p> 
+
+              <p>Please email <a href="mailto:[email protected]">[email protected]</a>.</p>
           </div>
       </div>
   </div>
@@ -47,12 +47,12 @@ <h4>Feedback</h4>
       <div class="col-md-9">
           <h2>About the project</h2>
 
-          <p>CLiC (Corpus Linguistics in Cheshire) is developed as part of an AHRC-funded project: “<a href="http://www.nottingham.ac.uk/CRAL/Projects/CLiC.aspx">CLiC Dickens - Characterisation in the representation of speech and body language from a corpus linguistic perspective</a>”.</p>
+          <p>CLiC (Corpus Linguistics in Cheshire) is developed as part of the AHRC-funded project: “<a href="http://www.nottingham.ac.uk/CRAL/Projects/CLiC.aspx">CLiC Dickens - Characterisation in the representation of speech and body language from a corpus linguistic perspective</a>”  (Arts and Humanities Research Council grant reference AH/K005146/1).</p>
 
           <p>The project demonstrates through corpus stylistics how computer-assisted methods can be used to study literary texts and lead to new insights into how readers perceive fictional characters.</p>
           <p>CLiC specifically supports the analysis of fictional speech and literary body language by enabling the user to search in particular parts of the texts, e.g. in quotes, which typically contain the direct speech of fictional characters in the novels.</p>
           <p>Initially, the texts that can be searched will be Dickens’s novels and novels written by other 19th century authors.</p>
-          
+
           <p>For feedback and questions please contact us on email <a href="mailto:[email protected]">[email protected]</a>.</p>
 
       </div>

diff --git a/clic/web/templates/layout/default.html b/clic/web/templates/layout/default.html
@@ -21,7 +21,8 @@
 <body>
 
 <div class="container">
-    <img class="pull-right" src="{{ url_for('static', filename='img/uonlogo.png') }}">
+    <img class="pull-right" src="{{ url_for('static', filename='img/uonlogo.png') }}" />
+    <img class="pull-right" src="{{ url_for('static', filename='img/AHRC10th_vert_RGB.png') }}" />
 
     <div class="header">
         <h1 class="uonHeaderh1">CLiC</h1>