Merge pull request #15 from vixen-project/add-logo

Add logo
vixen-project · Jan 23, 2018 · a7f0f76 · a7f0f76
2 parents c78f75e + dc3dde8
commit a7f0f76
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -7,6 +7,8 @@ ViXeN: View eXtract and aNnotate media
 [![Documentation Status](https://readthedocs.org/projects/vixen/badge/?version=latest)](http://vixen.readthedocs.io/en/latest/?badge=latest)
 
 
+![ViXeN logo](https://github.com/vixen-project/vixen/tree/master/docs/source/images/logo_small.png)
+
 ViXeN is a simple tool to facilitate easily viewing, adding, and annotating
 metadata associated with media.  ViXeN has been designed primarily to assist
 field biologists with managing the large amount of media they collect in

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -132,12 +132,12 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = 'images/logo_small.png'
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = 'images/vixen.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

diff --git a/docs/source/images/logo_small.png b/docs/source/images/logo_small.png
diff --git a/docs/source/images/vixen.ico b/docs/source/images/vixen.ico
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -72,7 +72,7 @@ Using Nautilus
 ^^^^^^^^^^^^^^^^^^^
 
 1. Download the ViXen binary file (say vixen-0.9-linux64.tgz) from
-   `ViXeN binary`_ to your preferred directory.
+   `ViXeN releases`_ to your preferred directory.
 
 2. Right click and select 'Extract Here' or 'Open With Archive Manager'. A
    ViXeN folder will appear in the directory you have selected (in this case

diff --git a/docs/source/overview.rst b/docs/source/overview.rst
@@ -63,14 +63,25 @@ https://groups.google.com/d/forum/vixen
 The ViXeN issue tracker and source code are available at:
 https://github.com/vixen-project/vixen
 
+-------------
+Citing ViXeN
+-------------
+
+You may use the following article to formally cite ViXeN if you wish:
+
+- Prabhu Ramachandran and Kadambari Devarajan, `ViXeN: An open-source package
+  for managing multimedia data <http://dx.doi.org/10.1111/2041-210X.12892>`_,
+  *Methods in Ecology and Evolution*, 2041-210X, 2017.
+
 
 --------
 Credits
 --------
 
 Designed and developed by Prabhu Ramachandran and Kadambari Devarajan.
 
-Thanks to Kamal Morjal for the CSS layout of the UI.
+Many thanks to Kamal Morjal for the CSS layout of the UI and to Khushalsingh
+Rajput who created the ViXeN logo based on the creative ideas of Kadambari.
 
 ---------
 Changelog

diff --git a/vixen/html/images/logo.png b/vixen/html/images/logo.png
diff --git a/vixen/html/images/logo_small.png b/vixen/html/images/logo_small.png
diff --git a/vixen/html/vixen_ui.html b/vixen/html/vixen_ui.html
@@ -21,15 +21,20 @@
         </script>
 
         <link href="$HTML_ROOT/css/style.css" rel="stylesheet">
-        <!-- Use an empty icon for now until we have a logo. -->
-        <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+        <link rel="icon" href="$HTML_ROOT/images/logo_small.png" type="image/png">
   </head>
 
 <body>
 <div id="app">
     <h2 style="text-align:center; padding: 0px; margin: 0px;">
         Welcome to ViXeN
     </h2>
+
+    <div v-if="ui.mode === 'edit' && !editor.project"
+         style="float:right;" class="sans-third">
+        <img src="$HTML_ROOT/images/logo.png" align="center" width="50%" alt="logo"/>
+    </div>
+
     <div style="position: absolute; bottom: 5px; right: 5px">
         <p>Version: {{ui.version}}</p>
     </div>
@@ -41,6 +46,7 @@ <h2 style="text-align:center; padding: 0px; margin: 0px;">
 
   <!-- Menu on the top -->
   <div style="position: absolute; top: 5px; margin-left: 5px;">
+      <img src="$HTML_ROOT/images/logo_small.png" height="30px" align="center" alt="logo"/>
       <a href="#" v-on:click="ui.home()" class="menu">Home</a>
       <a v-bind:href="ui.docs" target="_blank" class="menu">Help</a>
       <a v-bind:href="$ROOTui.log_file" target="_blank" class="menu">Log</a>