worked on web-ui

4 files changed, 24 insertions, 6 deletions

diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less
index d7be7289b..93a017fba 100644
--- a/module/web/static/css/default/style.less
+++ b/module/web/static/css/default/style.less
@@ -139,6 +139,10 @@ a:hover {
   -webkit-font-smoothing: antialiased;

 }

 

+.label-info, .badge-info {

+  background-color: @blue;

+}

+

 /*

     Header

 */

@@ -406,6 +410,7 @@ footer h2 {
   font-weight: bold;

   border-radius: 5px;

   line-height: 28px;

+  cursor: pointer;

 }

 

 .package-view > div:hover {

@@ -416,6 +421,7 @@ footer h2 {
   display: inline-block;

   height: 100%;

   padding-left: 8px;

+  padding-right: 8px;

 }

 

 .package-row.first {

@@ -425,7 +431,7 @@ footer h2 {
 .package-row.second {

   width: 30%;

   .gradient(top, @blueDark, @blueDarker);

-

+  font-size: smaller;

 }

 

 .package-view a {

@@ -464,8 +470,12 @@ footer h2 {
   display: inline-block;

   height: 100%;

   padding-left: 8px;

+  padding-right: 8px;

 }

 

 .file-row.first {

   width: 50%;

 }

+.file-row.second {

+  width: 30%;

+}

diff --git a/module/web/static/js/views/abstract/itemView.js b/module/web/static/js/views/abstract/itemView.js
index 993764d3e..a8cb14e7d 100644
--- a/module/web/static/js/views/abstract/itemView.js
+++ b/module/web/static/js/views/abstract/itemView.js
@@ -24,11 +24,15 @@ define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) {
             this.$el.zapIn();
         },
 
-        load: function() {
+        load: function(e) {
+            if(e)
+                e.stopPropagation();
             this.model.fetch();
         },
 
-        delete: function() {
+        delete: function(e) {
+            if(e)
+                e.stopPropagation();
             this.model.destroy();
         }
 
diff --git a/module/web/static/js/views/packageTreeView.js b/module/web/static/js/views/packageTreeView.js
index f746bf0a3..516c2f5d1 100644
--- a/module/web/static/js/views/packageTreeView.js
+++ b/module/web/static/js/views/packageTreeView.js
@@ -64,7 +64,7 @@ define(['jquery', 'backbone', 'underscore', 'models/TreeCollection', 'views/pack
                     type: 'POST',
                     data: {
                         name: JSON.stringify($('#name').val()),
-                        links: JSON.stringify(['http://download.pyload.org/random.bin'])
+                        links: JSON.stringify(['http://download.pyload.org/random.bin', 'invalid link'])
                     },
                     success: function() {
                         self.tree.fetch({success: function() {
diff --git a/module/web/static/js/views/packageView.js b/module/web/static/js/views/packageView.js
index 6a7e3cc65..a0de18827 100644
--- a/module/web/static/js/views/packageView.js
+++ b/module/web/static/js/views/packageView.js
@@ -8,7 +8,7 @@ define(['jquery', 'views/abstract/itemView', 'underscore', 'views/fileView', 'ut
         className: 'package-view',
         template: _.template($("#template-package").html()),
         events: {
-            'click .load': 'load',
+            'click .package-header': 'load',
             'click .delete': 'delete',
             'click .show-dialog': 'show_dialog'
         },
@@ -28,6 +28,8 @@ define(['jquery', 'views/abstract/itemView', 'underscore', 'views/fileView', 'ut
         },
 
         render: function() {
+
+            // TODO: on expanding don't re-render
             this.$el.html(this.template(this.model.toJSON()));
 
             var data = [
@@ -54,7 +56,9 @@ define(['jquery', 'views/abstract/itemView', 'underscore', 'views/fileView', 'ut
             });
         },
 
-        show_dialog: function() {
+        show_dialog: function(e) {
+            console.log(e);
+            e.stopPropagation();
             var self = this;
             this.requireOnce(['views/modal/modalView'], function(modalView){
                 if (self.modal === null)