Merge pull request #1 from sukhbir-singh/fixes

bug #2406 solved
amahi · Aug 16, 2019 · a3fb165 · a3fb165
2 parents 4440e2c + f991f5e
commit a3fb165
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 7 deletions.
diff --git a/app/assets/javascripts/webapps.js.coffee b/app/assets/javascripts/webapps.js.coffee
@@ -13,11 +13,13 @@ $(document).ready ->
 
 #new webapp
 $(document).on "ajax:success", "#webapp-new", (event, results) ->
+	console.log(results)
 	if results.status is "ok"
   		$('#webapps-table').parent().html(results.content)
 
 
 $(document).on "ajax:success", ".delete_webapp", (event, results) ->
+	console.log(results)
 	if results.status is "ok"
 		$('#webapps-table').parent().html(results.content)
 

diff --git a/app/assets/stylesheets/webapp_style.css b/app/assets/stylesheets/webapp_style.css
@@ -5,3 +5,27 @@
 	display: inline-block;
 	text-indent: -9999px;
 }
+
+
+div.webapp table{
+    background: white;
+}
+
+div.webapp table:hover{
+    cursor: pointer;
+}
+
+.settings-stretcher{
+	background: white;
+    margin-bottom: 6px;
+    padding-top: 6px;
+    margin-top: 2px;
+}
+
+.webapp-table-row{
+	background: #fbfbfb !important;
+}
+
+.webapp-table-row:hover{
+    background: #dcdcdc !important;
+}
diff --git a/app/views/webapps/_form.html.slim b/app/views/webapps/_form.html.slim
@@ -5,7 +5,7 @@
         :ok_icon_path => theme_image_path('ok.png'), \
         :error_icon_path => theme_image_path('stop.png') \
       }, \
-      :class => 'webapp create-form form-horizontal', \
+      :class => 'webapp create-form form-horizontal p-1 mt-2 bg-white d-inline-block', \
       :id => 'webapp-new' \
     } do |f|
 
@@ -23,4 +23,4 @@
           .controls.col-xs-offset-2.col-xs-10
             = spinner
             = button_tag t('create'), :type => 'submit', :id => 'webapp_create_button', :class => 'btnn btn btn-info'
-            = link_to t('cancel'), '#', :class => 'close-area cancel-link btn btn-primary left-margin-10', :data => {:related => '#new-webapp-to-step1'}
+            = link_to t('cancel'), '#', :class => 'close-area cancel-link cancel-btn-style btn-sm left-margin-10', :data => {:related => '#new-webapp-to-step1'}
diff --git a/app/views/webapps/_list.html.slim b/app/views/webapps/_list.html.slim
@@ -1,6 +1,6 @@
 .settings-table#webapps-table
   - if @webapps.size > 0
-    table.settings.table
+    table.settings
       thead
         tr
           th.settings-col1.webapps-col1 scope="col" = t 'name'

diff --git a/app/views/webapps/_webapp.html.slim b/app/views/webapps/_webapp.html.slim
@@ -2,8 +2,9 @@
 - webapp = webapp
 - uid = webapp.id.to_s
 - return if webapp.nil?
+
 div.webapp[id="whole_webapp_#{uid}"]
-  table.settings.table.stretchtoggle.table-condensed id="webapp_row_#{uid}"
+  table.webapp-table-row.settings.stretchtoggle.table-condensed id="webapp_row_#{uid}"
     tr
       td.settings-col1.webapps-col1.settings-col1-pad
         = link_to(webapp.name, '')
@@ -27,9 +28,9 @@ div.webapp[id="whole_webapp_#{uid}"]
                       :method => :delete,
                       :id => "delete-webapp-#{webapp.id}",
                       :data => { :confirm => "Are you sure you want to delete "+ webapp.name},
-                      :class => 'btn btn-primary btn-sm btn-delete navbar-right delete_webapp remote-btn'
+                      :class => 'btn-delete remote-btn navbar-right btn btn-sm d-inline-block'
         .settings-fields
-          table.table.table-condensed
+          table.table-condensed
             tr
               td
                 = t 'name'

diff --git a/app/views/webapps/index.html.slim b/app/views/webapps/index.html.slim
@@ -1,2 +1,3 @@
 = stylesheet_link_tag 'webapp_style'
-=render 'content'
+= javascript_include_tag 'webapps'
+= render 'content'
diff --git a/app/views/webapps/permissions.html.slim b/app/views/webapps/permissions.html.slim
@@ -1,4 +1,6 @@
 = stylesheet_link_tag 'webapp_style'
+= javascript_include_tag 'webapps'
+
 .settings-table#permissions
   - if @webapps.size > 0
     table.settings.table