mergin init and renaming subtab

Signed-off-by: Arpit Goyal <[email protected]>
amahi · Jun 19, 2014 · f012ecc · f012ecc
2 parents b08e8a9 + 859542c
commit f012ecc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,24 @@
+*.rbc
+capybara-*.html
+.rspec
+/log
+/tmp
+/db/*.sqlite3
+/public/system
+/coverage/
+/spec/tmp
+**.orig
+rerun.txt
+pickle-email-*.html
+config/initializers/secret_token.rb
+config/secrets.yml
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+web-apps
+========
+
+Amahi Web Apps plugin
diff --git a/app/views/webapps/_permission_webapp.html.slim b/app/views/webapps/_permission_webapp.html.slim
@@ -14,7 +14,7 @@ div.webapp[id="whole_webapp_#{uid}"]
     .webapp-manage
       fieldset
         legend
-          |&nbsp; #{t 'edit_web_app_permission_for'}&nbsp;
+          |&nbsp; #{t 'edit_web_app_access_for'}&nbsp;
           b= h(@webapp.name)
           | &nbsp;
         .settings-fields

diff --git a/config/initializers/plugin_init.rb b/config/initializers/plugin_init.rb
@@ -2,4 +2,4 @@
 t = Tab.find("apps")
 # add any subtabs with what you need. params are controller and the label, for example
 t.add("webapps", "Web Apps")
-t.add("webapps/permissions","Permissions")
+t.add("webapps/permissions","Access")