Load stylesheets only when plugin is called

agmps17 · agmps17 · commit a8a2a37eb8c6 · 2014-07-21T01:54:26.000+05:30
Signed-off-by: Arpit Goyal &lt;agmps17@gmail.com&gt;
diff --git a/app/assets/stylesheets/webapp_style.css b/app/assets/stylesheets/webapp_style.css
@@ -5,7 +5,3 @@
 	display: inline-block;
 	text-indent: -9999px;
 }
-
-.settings-table{
-margin-top: 30px;
-}
diff --git a/app/assets/stylesheets/webapps.scss b/app/assets/stylesheets/webapps.scss
@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- /*=require webapp_style
- */
diff --git a/app/views/webapps/_list.html.slim b/app/views/webapps/_list.html.slim
@@ -1,47 +1,46 @@
-#webapps-table
-  .settings-table
-    - if @webapps.size > 0
-      table.settings.table
-        thead
-          tr
-            th.settings-col1.webapps-col1 scope="col" = t 'name'
-            th.settings-col2.webapps-col2 scope="col" = t 'url'
-        tbody
-      = render :partial => 'webapp', :collection => @webapps
-    - else
-      div align="center"
-        div align="left"
-          h2= t 'there_are_no_webapps'
-          p Web apps are web-based applications hosted in your Amahi HDA.
-          p
-            | Example of web apps are
-            a href="http://www.wordpress.org" target="_blank"  Wordpress
-            |,
-            a href="http://www.mediawiki.org" target="_blank"  MediaWiki
-            |,
-            a href="http://gallery.menalto.com/" target="_blank"  Gallery
-            |,
-            a href="http://www.webmin.com/" target="_blank"  Webmin
-            | and
-            a href="http://phpsysinfo.sourceforge.net/" target="_blank"  PHPSysinfo
-          p There are a myriad of other apps that run under Linux.
-          p You can install web apps in this panel by:
-          p
-            ul
-              li
-                | Deciding what
-                b " name"
-                | you want to access the web app within your network (e.g. http://blog), and
-              li
-                | Selecting where is the
-                b " root directory"
-                | of the app you want to run
-          p The application code is expected to be present (before or after configuring the app) in the root directory.
-          p You can install it there as an archive from source (tar/zip), or as a package from existing applications in the base OS.
-          p Currently supported are applications based on LAMP (PHP), Python, static pages and others.
-          p
-            | We have a small
-            a href="http://wiki.amahi.org/index.php/Category:Apps" target="_blank"  gallery of apps
-            | that other Amahi
-            | developers and users have tried and tested.
+.settings-table#webapps-table
+  - if @webapps.size > 0
+    table.settings.table
+      thead
+        tr
+          th.settings-col1.webapps-col1 scope="col" = t 'name'
+          th.settings-col2.webapps-col2 scope="col" = t 'url'
+      tbody
+    = render :partial => 'webapp', :collection => @webapps
+  - else
+    div align="center"
+      div align="left"
+        h2= t 'there_are_no_webapps'
+        p Web apps are web-based applications hosted in your Amahi HDA.
+        p
+          | Example of web apps are
+          a href="http://www.wordpress.org" target="_blank"  Wordpress
+          |,
+          a href="http://www.mediawiki.org" target="_blank"  MediaWiki
+          |,
+          a href="http://gallery.menalto.com/" target="_blank"  Gallery
+          |,
+          a href="http://www.webmin.com/" target="_blank"  Webmin
+          | and
+          a href="http://phpsysinfo.sourceforge.net/" target="_blank"  PHPSysinfo
+        p There are a myriad of other apps that run under Linux.
+        p You can install web apps in this panel by:
+        p
+          ul
+            li
+              | Deciding what
+              b " name"
+              | you want to access the web app within your network (e.g. http://blog), and
+            li
+              | Selecting where is the
+              b " root directory"
+              | of the app you want to run
+        p The application code is expected to be present (before or after configuring the app) in the root directory.
+        p You can install it there as an archive from source (tar/zip), or as a package from existing applications in the base OS.
+        p Currently supported are applications based on LAMP (PHP), Python, static pages and others.
+        p
+          | We have a small
+          a href="http://wiki.amahi.org/index.php/Category:Apps" target="_blank"  gallery of apps
+          | that other Amahi
+          | developers and users have tried and tested.
 
diff --git a/app/views/webapps/_new.html.slim b/app/views/webapps/_new.html.slim
@@ -1,4 +1,4 @@
-= button_tag "#{t('new_web_app')}" , :type => 'button', :class => 'open-area btn btn-create', :id => "new-webapp-to-step1",  :data => { :related => "#new-webapp-step1" }
+= button_tag "#{t('new_web_app')}" , :type => 'button', :class => 'open-area btnn btn btn-create', :id => "new-webapp-to-step1",  :data => { :related => "#new-webapp-step1" }
 
 #new-webapp-box
   #webapp-new
diff --git a/app/views/webapps/index.html.slim b/app/views/webapps/index.html.slim
@@ -1 +1,2 @@
+= stylesheet_link_tag 'webapp_style'
 =render 'content'
diff --git a/app/views/webapps/permissions.html.slim b/app/views/webapps/permissions.html.slim
@@ -1,14 +1,14 @@
-#webapps-table
-  .settings-table
-    - if @webapps.size > 0
-      table.settings.table
-        thead
-          tr
-            th.settings-col1.webapps-col1 scope="col" = t 'name'
-            th.settings-col2.webapps-col2 scope="col" = t 'url'
-        tbody
-      = render :partial => 'permission_webapp', :collection => @webapps, :as=> :webapp
-    - else
-      div align="center"
-          div align="left"
-            h2= t 'there_are_no_webapps'
+= stylesheet_link_tag 'webapp_style'
+.settings-table#permissions
+  - if @webapps.size > 0
+    table.settings.table
+      thead
+        tr
+          th.settings-col1.webapps-col1 scope="col" = t 'name'
+          th.settings-col2.webapps-col2 scope="col" = t 'url'
+      tbody
+    = render :partial => 'permission_webapp', :collection => @webapps, :as=> :webapp
+  - else
+    div align="center"
+        div align="left"
+          h2= t 'there_are_no_webapps'

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,3 @@`
`5`	`5`	`display: inline-block;`
`6`	`6`	`text-indent: -9999px;`
`7`	`7`	`}`
`8`		`-`
`9`		`-.settings-table{`
`10`		`-margin-top: 30px;`
`11`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= button_tag "#{t('new_web_app')}" , :type => 'button', :class => 'open-area btn btn-create', :id => "new-webapp-to-step1", :data => { :related => "#new-webapp-step1" }`
	`1`	`+= button_tag "#{t('new_web_app')}" , :type => 'button', :class => 'open-area btnn btn btn-create', :id => "new-webapp-to-step1", :data => { :related => "#new-webapp-step1" }`
`2`	`2`
`3`	`3`	`#new-webapp-box`
`4`	`4`	`#webapp-new`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+= stylesheet_link_tag 'webapp_style'`
`1`	`2`	`=render 'content'`