diff --git a/lvl-project/lvl-auth/.settings/org.eclipse.wst.common.component b/lvl-project/lvl-auth/.settings/org.eclipse.wst.common.component index e32b8683..86f72d76 100644 --- a/lvl-project/lvl-auth/.settings/org.eclipse.wst.common.component +++ b/lvl-project/lvl-auth/.settings/org.eclipse.wst.common.component @@ -4,10 +4,10 @@ - + uses - + uses diff --git a/lvl-project/lvl-auth/pom.xml b/lvl-project/lvl-auth/pom.xml index 761165e4..f33433b3 100644 --- a/lvl-project/lvl-auth/pom.xml +++ b/lvl-project/lvl-auth/pom.xml @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl lvl-project - 1.0.0 + 1.0.1 .. diff --git a/lvl-project/lvl-bundle/pom.xml b/lvl-project/lvl-bundle/pom.xml index 07ee4ab0..83e099fd 100644 --- a/lvl-project/lvl-bundle/pom.xml +++ b/lvl-project/lvl-bundle/pom.xml @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl lvl-project - 1.0.0 + 1.0.1 .. diff --git a/lvl-project/lvl-bundle/src/main/ui/css/lvl.css b/lvl-project/lvl-bundle/src/main/ui/css/lvl.css index a0369b6a..843463f2 100644 --- a/lvl-project/lvl-bundle/src/main/ui/css/lvl.css +++ b/lvl-project/lvl-bundle/src/main/ui/css/lvl.css @@ -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; diff --git a/lvl-project/lvl-bundle/src/main/ui/index.html b/lvl-project/lvl-bundle/src/main/ui/index.html index 765aa906..f8fcbc18 100644 --- a/lvl-project/lvl-bundle/src/main/ui/index.html +++ b/lvl-project/lvl-bundle/src/main/ui/index.html @@ -1,5 +1,5 @@ - +--> @@ -53,7 +53,7 @@

Loading the LeishVL...

- + \ No newline at end of file diff --git a/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/header_workspace_view.js b/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/header_workspace_view.js index a1a7b2b0..31c4a25f 100644 --- a/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/header_workspace_view.js +++ b/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/header_workspace_view.js @@ -87,6 +87,7 @@ 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', @@ -94,7 +95,7 @@ define([ 'app', 'tpl!apps/header/show/tpls/header_workspace', 'tpl!apps/header/s '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(); @@ -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'); @@ -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 : { @@ -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) + '…' : msg) + message : (msg.length > 140 ? msg.substr(0, 139) + '…' : msg) }); } tplData = { diff --git a/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/tpls/header_notifications.html b/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/tpls/header_notifications.html index 680fec8b..bf888b35 100644 --- a/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/tpls/header_notifications.html +++ b/lvl-project/lvl-bundle/src/main/ui/js/apps/header/show/tpls/header_notifications.html @@ -1,17 +1,17 @@
- <% if (notifications) { %>
+ <% if (notifications) { %> <% _.each(notifications, function(item){ %>
<%= item.date %>
-
<%= item.message %>
-
+
<%= item.message %>
<% }); %> <% } %> +
\ No newline at end of file diff --git a/lvl-project/lvl-bundle/src/main/ui/js/apps/open/documentation/show/tpls/documentation-main-section.html b/lvl-project/lvl-bundle/src/main/ui/js/apps/open/documentation/show/tpls/documentation-main-section.html index 48067103..58eb8739 100644 --- a/lvl-project/lvl-bundle/src/main/ui/js/apps/open/documentation/show/tpls/documentation-main-section.html +++ b/lvl-project/lvl-bundle/src/main/ui/js/apps/open/documentation/show/tpls/documentation-main-section.html @@ -1,5 +1,5 @@

The following documentation corresponds to the latest stable version - (1.0.0) + (1.0.1) of the LeishVL, released on January 2016.

\ No newline at end of file diff --git a/lvl-project/lvl-bundle/src/main/ui/js/apps/open/software/show/tpls/software-releases-section.html b/lvl-project/lvl-bundle/src/main/ui/js/apps/open/software/show/tpls/software-releases-section.html index 604ae0a6..07997203 100644 --- a/lvl-project/lvl-bundle/src/main/ui/js/apps/open/software/show/tpls/software-releases-section.html +++ b/lvl-project/lvl-bundle/src/main/ui/js/apps/open/software/show/tpls/software-releases-section.html @@ -14,6 +14,12 @@ Planned upgrade Release notes + + 1.0.1 + Jan 11st, 2016 + Minor fixes + Release notes + 1.0.0 Jan 11st, 2016 diff --git a/lvl-project/lvl-core/pom.xml b/lvl-project/lvl-core/pom.xml index 67d037a6..4b6de515 100644 --- a/lvl-project/lvl-core/pom.xml +++ b/lvl-project/lvl-core/pom.xml @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl lvl-project - 1.0.0 + 1.0.1 .. diff --git a/lvl-project/lvl-service/.settings/org.eclipse.wst.common.component b/lvl-project/lvl-service/.settings/org.eclipse.wst.common.component index 6381676b..f00068f0 100644 --- a/lvl-project/lvl-service/.settings/org.eclipse.wst.common.component +++ b/lvl-project/lvl-service/.settings/org.eclipse.wst.common.component @@ -4,10 +4,10 @@ - + uses - + uses diff --git a/lvl-project/lvl-service/pom.xml b/lvl-project/lvl-service/pom.xml index 98b7281e..b3576032 100644 --- a/lvl-project/lvl-service/pom.xml +++ b/lvl-project/lvl-service/pom.xml @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl lvl-project - 1.0.0 + 1.0.1 .. diff --git a/lvl-project/lvl-storage/pom.xml b/lvl-project/lvl-storage/pom.xml index 0618fd8f..ad55dd97 100644 --- a/lvl-project/lvl-storage/pom.xml +++ b/lvl-project/lvl-storage/pom.xml @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl lvl-project - 1.0.0 + 1.0.1 .. diff --git a/lvl-project/lvl-test/pom.xml b/lvl-project/lvl-test/pom.xml index 6b3e5633..c251b037 100644 --- a/lvl-project/lvl-test/pom.xml +++ b/lvl-project/lvl-test/pom.xml @@ -27,7 +27,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl lvl-project - 1.0.0 + 1.0.1 .. diff --git a/lvl-project/pom.xml b/lvl-project/pom.xml index c92a3ac7..1d31ad50 100644 --- a/lvl-project/pom.xml +++ b/lvl-project/pom.xml @@ -26,7 +26,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl leishmaniasis-virtual-lab - 1.0.0 + 1.0.1 .. diff --git a/pom.xml b/pom.xml index e4301d26..5c2d0b09 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. eu.eubrazilcc.lvl leishmaniasis-virtual-lab - 1.0.0 + 1.0.1 pom leishmaniasis-virtual-laboratory - BOM