Merge pull request #194 from iimog/release-1.0.4

Release 1.0.4
molbiodiv · Apr 24, 2018 · 172b322 · 172b322
2 parents 00ad993 + f31bf1b
commit 172b322
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ Those can then be mapped onto user provided community data.
  - **I want to read/cite the preprint describing FENNEC.** &rarr; [![bioRxiv](https://img.shields.io/badge/DOI-10.1101%2F194308-blue.svg)](https://doi.org/10.1101/194308)
  - **I want to reference the source code of FENNEC.** &rarr; [![DOI](https://zenodo.org/badge/51136300.svg)](https://zenodo.org/badge/latestdoi/51136300) Please also cite our preprint.
  - **I want to find the docker image of FENNEC.** &rarr; [Docker Hub](https://hub.docker.com/r/iimog/fennec/)
+ - **I want to see the TravisCI build of FENNEC.** &rarr; [![Build Status](https://travis-ci.org/molbiodiv/fennec.svg?branch=master)](https://travis-ci.org/molbiodiv/fennec)
+ - **I want to test new features of FENNEC.** &rarr; [Beta Version](https://beta.fennec.molecular.eco)
 
 ## Setup development environment
 So you want to contribute to the development of FENNEC - awesome!
@@ -126,6 +128,10 @@ The api doc on the other hand is dynamically created from the php annotations in
 Those are served from [localhost:3141/api/doc](http://localhost:3141/api/doc).
 
 ## Changes
+### 1.0.4 <2018-04-24>
+ - Update startpage design
+ - Add guide for new users (#194)
+ - Change version to database (#190)
 ### 1.0.3 <2018-03-29>
  - Fix dbversion of mapping in import commands (#175)
 ### 1.0.2 <2018-03-28>

diff --git a/app/Resources/client/scss/panels.scss b/app/Resources/client/scss/panels.scss
@@ -28,3 +28,15 @@
 .info-trait {
     color: darken($trait, 5%);
 }
+
+.panel-user-guide > .panel-heading {
+    background-color: $project;
+    border-color: darken($project, 5%);
+    color: #FFF;
+}
+
+.panel-disabled > .panel-heading {
+    background-color: rgba(81,79,80,0.65);
+    border-color: rgba(81,79,80,0.65);
+    color: #FFF;
+}
diff --git a/app/Resources/views/base.navigation.html.twig b/app/Resources/views/base.navigation.html.twig
@@ -22,7 +22,7 @@
                     <!-- /.navbar-header -->
 
             <ul class="nav navbar-top-links navbar-right">
-                <font style="margin-right: 5px; font-size: 16px;">version: </font>
+                <font style="margin-right: 5px; font-size: 16px;">database: </font>
 
                 <select class="selectpicker" id="dbVersionPicker">
                     {% for dbversion in dbversions|split('|') %}
@@ -102,18 +102,16 @@
         </nav>
 
         <div id="page-wrapper">
-            <div id="page-wrapper-{{ type }}">
-                {% if title is defined and type != "startpage" %}
-                    <div class="row">
-                        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-                            <h1 class="page-header" id="page-title">{{ title  }} </h1>
-                        </div>
+            {% if title is defined and fennecLayoutType != "startpage" %}
+                <div class="row">
+                    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+                        <h1 class="page-header" id="page-title">{{ title  }} </h1>
                     </div>
-                {% endif %}
-                <div id="global-message-area"></div>
-                {% block content %}
-                {% endblock %}
-            </div>
+                </div>
+            {% endif %}
+            <div id="global-message-area"></div>
+            {% block content %}
+            {% endblock %}
         </div>
     </div>
     {% include 'googleAnalytics/dialog.html.twig' %}

diff --git a/app/Resources/views/startpage/index.html.twig b/app/Resources/views/startpage/index.html.twig
@@ -61,7 +61,7 @@
                     </div>
                     <h4>Beta Version</h4>
                     <p>
-                        Check out our beta version of FENNEC and keep informed about new pre-released features.
+                        Check out our <a href="https://beta.fennec.molecular.eco">beta version of FENNEC</a> and keep informed about new pre-released features.
                     </p>
                 </div>
                 <div class="blockquote-box blockquote-contribute clearfix">

diff --git a/app/Resources/views/startpage/info-panels.html.twig b/app/Resources/views/startpage/info-panels.html.twig
@@ -53,7 +53,7 @@
 </div>
 <div class="row">
     <div class="col-lg-6">
-        <div class="panel panel-user-guide" style="border: none;">
+        <div class="panel panel-user-guide panel-disabled" style="border: none;">
             <div class="panel-heading panel-title">
                 You have trait information?
             </div>
@@ -62,8 +62,8 @@
                     <i class="fa fa-table fa-5x text-right"></i>
                 </div>
                 <div class="col-xs-11" style="padding: 20px;">
-                    Then upload your data and share it with other users
-                    <a href={{ path('my_traits', {'dbversion': dbversion  }) }}>here</a>.
+                    Then upload your data and share it with other users.
+                    This is currently only possible in the <a href="https://beta.fennec.molecular.eco">beta version</a>.
                 </div>
             </div>
         </div>

diff --git a/app/config/version.yml b/app/config/version.yml
@@ -1,2 +1,2 @@
 parameters:
-    application_version: 1.0.3
+    application_version: 1.0.4