Skip to content

Commit

Permalink
Change version to 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
etorres committed Jan 11, 2016
1 parent 7ae6fa6 commit c5fc7a9
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="lvl-storage-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-storage/lvl-storage">
<dependent-module archiveName="lvl-storage-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-storage/lvl-storage">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="lvl-core-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-core/lvl-core">
<dependent-module archiveName="lvl-core-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-core/lvl-core">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/lvl-auth/target/classes"/>
Expand Down
2 changes: 1 addition & 1 deletion lvl-project/lvl-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>lvl-project</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lvl-project/lvl-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>lvl-project</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
7 changes: 7 additions & 0 deletions lvl-project/lvl-bundle/src/main/ui/css/lvl.css
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,13 @@
color: rgb(204, 153, 0);
}

@media ( min-width : 768px ) {
.lvl-notifications-container {
width: 300px !important;
max-width: 300px !important;
}
}

div#lvl-qtip-growl-container {
position: fixed;
top: 116px;
Expand Down
6 changes: 3 additions & 3 deletions lvl-project/lvl-bundle/src/main/ui/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- lvl
<!--
Copyright 2014-2015 EUBrazilCC (EU‐Brazil Cloud Connect)
Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
Expand All @@ -19,7 +19,7 @@
file for details on the various modules and licenses.
The "NOTICE" text file is part of the distribution. Any derivative works
that you distribute must include a readable copy of the "NOTICE" text file.
/lvl -->
-->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
Expand Down Expand Up @@ -53,7 +53,7 @@ <h4 style="text-align: center; color: #34495E;">Loading the LeishVL...</h4>

<a href="#top" class="lvl-back-to-top" style="visibility: hidden;" title="Scroll to top">Top</a>

<script data-main="js/requirejs_main.js?Od2uqu8dahpe" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.20/require.min.js" type="text/javascript"></script>
<script data-main="js/requirejs_main.js?eiVooQuoo_z8" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.20/require.min.js" type="text/javascript"></script>

</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,15 @@ define([ 'app', 'tpl!apps/header/show/tpls/header_workspace', 'tpl!apps/header/s
events : {
'click a#btnSearchToggle' : 'toggleSearchForm',
'click a#btnProfile' : 'showUserProfile',
'click a#btnAlerts' : 'showNotifications',
'click a#lvl-search-form-collapse-btn' : 'collapseSearchForm',
'click button#lvl-search-form-submit-btn-xs' : 'submitSearchFormXs',
'submit form#lvl-search-form' : 'submitSearchForm',
'submit form#lvl-search-form-xs' : 'submitSearchFormXs',
'dragover div#lvl-save-items-target' : 'saveItemsDragOverHandler',
'dragenter div#lvl-save-items-target' : 'saveItemsDragEnterHandler',
'dragleave div#lvl-save-items-target' : 'saveItemsDragLeaveHandler',
'drop div#lvl-save-items-target' : 'saveItemsDropHandler'
'drop div#lvl-save-items-target' : 'saveItemsDropHandler'
},
toggleSearchForm : function(e) {
e.preventDefault();
Expand All @@ -117,6 +118,10 @@ define([ 'app', 'tpl!apps/header/show/tpls/header_workspace', 'tpl!apps/header/s
e.preventDefault();
this.trigger('access:user:profile');
},
showNotifications : function(e) {
e.preventDefault();

},
submitSearchFormXs : function(e) {
e.preventDefault();
var searchInputXs = this.$('#lvl-search-form-input-xs');
Expand Down Expand Up @@ -226,14 +231,15 @@ define([ 'app', 'tpl!apps/header/show/tpls/header_workspace', 'tpl!apps/header/s
// remove all event handlers
Lvl.vent.off('editable:items:dragstart');
Lvl.vent.off('editable:items:dragend');
$(document).off('keyup', this.handleEscKeyUpEvent);
$(document).off('keyup', this.handleEscKeyUpEvent);
this.$('a#btnAlerts').unbind();
},
onRender : function(options) {
this.navigation.show(new View.Navigation({
model : options.navLinks.selected || options.navLinks.at(0),
collection : options.navLinks
}));
this.$('#btnAlerts').click(function(event) {
this.$('a#btnAlerts').click(function(event) {
event.preventDefault();
}).qtip({
content : {
Expand All @@ -253,11 +259,11 @@ define([ 'app', 'tpl!apps/header/show/tpls/header_workspace', 'tpl!apps/header/s
return b.date - a.date;
});
var notifications = [];
for (i = 0; i < content.elements.length && i < 5; i++) {
for (var i = 0; i < content.elements.length && i < 5; i++) {
var msg = content.elements[i].message || '';
notifications.push({
date : moment(content.elements[i].issuedAt).format('MMM DD[,] YYYY [at] HH[:]mm'),
message : (msg.length > 24 ? msg.substr(0, 23) + '&hellip;' : msg)
message : (msg.length > 140 ? msg.substr(0, 139) + '&hellip;' : msg)
});
}
tplData = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="row">
<div class="col-xs-12">
<ul class="list-inline text-center">
<li><small><a href="#">view all</a></small></li>
<li><small><a href="#" id="view-all-notifications">view all</a></small></li>
<li>&middot;</li>
<li><small><a href="#">clear all</a></small></li>
<li><small><a href="#" id="clear-all-notifications">clear all</a></small></li>
</ul>
<% if (notifications) { %>
<dl>
<% if (notifications) { %>
<% _.each(notifications, function(item){ %>
<dt><%= item.date %></dt>
<dd><%= item.message %></dd>
</dl>
<dd><%= item.message %></dd>
<% }); %>
<% } %>
</dl>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p class="lead">
The following documentation corresponds to the latest stable version
(<a href="https://github.com/eubrazilcc/leishmaniasis-virtual-lab/releases/tag/v1.0.0" target="_blank" title="Release 1.0.0">1.0.0</a>)
(<a href="https://github.com/eubrazilcc/leishmaniasis-virtual-lab/releases/tag/v1.0.1" target="_blank" title="Release 1.0.1">1.0.1</a>)
of the <a href="/#home" title="Leishmaniasis Virtual Laboratory">L<span class="text-danger">ei</span>shVL</a>, released on January 2016.
</p>
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
<td>Planned upgrade</td>
<td class="text-muted">Release notes</td>
</tr>
<tr>
<td>1.0.1</td>
<td>Jan 11<sup>st</sup>, 2016</td>
<td>Minor fixes</td>
<td><a href="https://github.com/eubrazilcc/leishmaniasis-virtual-lab/releases/tag/v1.0.1" target="_blank">Release notes</a></td>
</tr>
<tr>
<td>1.0.0</td>
<td>Jan 11<sup>st</sup>, 2016</td>
Expand Down
2 changes: 1 addition & 1 deletion lvl-project/lvl-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>lvl-project</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="lvl-storage-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-storage/lvl-storage">
<dependent-module archiveName="lvl-storage-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-storage/lvl-storage">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="lvl-core-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-core/lvl-core">
<dependent-module archiveName="lvl-core-1.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/lvl-core/lvl-core">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="lvl-service"/>
Expand Down
2 changes: 1 addition & 1 deletion lvl-project/lvl-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>lvl-project</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lvl-project/lvl-storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>lvl-project</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lvl-project/lvl-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>lvl-project</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lvl-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.
<parent>
<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>leishmaniasis-virtual-lab</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ that you distribute must include a readable copy of the "NOTICE" text file.

<groupId>eu.eubrazilcc.lvl</groupId>
<artifactId>leishmaniasis-virtual-lab</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>pom</packaging>

<name>leishmaniasis-virtual-laboratory - BOM</name>
Expand Down

0 comments on commit c5fc7a9

Please sign in to comment.