sharkey-web 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c859fd93f5ac733140dd9cb2d3662e99c11d25
-  data.tar.gz: 41e261fb32b555653c430a6c2e6a36e00da25ee2
+  metadata.gz: 5eed5d83a3fa4708b7b30081bf07abadcd12799c
+  data.tar.gz: 5e52ee04e42984e2fe767a7d935f3f3ce84cb223
 SHA512:
-  metadata.gz: 6040314cc0df0c3e8b172651782d85f381469c707744440683226a5137c479ee1a067058f8bb04945f36d9a2f96b3eb27309ff1bbc17fd19a4db62acf2a60233
-  data.tar.gz: 2b34103961644e0d9ec3434f144a41b679a0fe52547542105481566435a97e2e21dc4d9c1664786ab67bd22ac4f5091b2e85dda9c600d3a445e07cc186b662cf
+  metadata.gz: 7ce5e48188f73bda86a084f4c101ac0f45e7c73509311d27442c3965621ab690ddb9e9f3b98b496996d73dacd8599ae7e617de6bdd8fa4c4c9c233fc2cc8f122
+  data.tar.gz: bcbdd3cbf2579a1e2cc843c205abaaad9113a63b0338a1686746dc7348619e666c0807fc487c6f35ca803d326f59b1c1eb5cf65cba8536e8bd883f82fb4a2c4b

data/README.md

@@ -43,7 +43,7 @@ were very complicated to install.
 
 Well, `sharkey` is an attempt to gather the best things from them.
 
-You should probably [check out the live demo][live]. <br />
+You should probably check out the [live demo on saruman.link:5678](http://saruman.link:5678/). <br />
 Be warned, though, that since it's completely public it might have some
 nasty spam or _even worse things_. <br />
 But `sharkey` allows you to easily destroy all data so it shouldn't be
@@ -175,14 +175,13 @@ The whole code is released under the *MIT-license*.
 Check file `LICENSE.md` for details on what you can and
 cannot do with it.
 
-[delicious]: https://delicious.com/
-[hoard]: http://www.urbandictionary.com/define.php?term=Tab-Hoarder
-[gem]:   http://link
-[live]:  http://saruman.link/sharkey/
-[sinatra]: http://
-[ruby]:
-[vegas]:
-[bootstrap]:
-[bootswatch]:
-[jquery]:
+[delicious]:  https://delicious.com/
+[hoard]:      http://www.urbandictionary.com/define.php?term=Tab-Hoarder
+[gem]:        http://link
+[sinatra]:    http://
+[ruby]:       https://www.ruby-lang.org/
+[vegas]:      http://code.quirkey.com/vegas/
+[bootstrap]:  http://getbootstrap.com/
+[bootswatch]: http://bootswatch.com/
+[jquery]:     http://jquery.com/
 

data/lib/sharkey/app.rb

@@ -114,6 +114,17 @@ module Sharkey
 
         datetime.strftime '%Y-%m-%d %H:%m'
       end
+
+      # Returns an array with all the themes names
+      def get_themes
+        themes_dir = File.join(File.dirname(__FILE__), '/public/themes')
+
+        themes = []
+        Dir.entries(themes_dir).sort.each do |dir|
+          themes.push dir if ((dir != 'fonts') and (dir[0] != '.'))
+        end
+        themes
+      end
     end
 
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

data/lib/sharkey/version.rb

@@ -1,5 +1,5 @@
 
 module Sharkey
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 end
 

data/lib/sharkey/views/settings_index.slim

@@ -50,12 +50,11 @@ h2.sub-header#appearance Appearance
     form#theme-form role="form" action="/setting" method="POST"
       .form-group
         select.form-control#theme-select name="theme" placeholder="Theme"
-          - Dir.entries(File.expand_path('./lib/sharkey/public/themes')).sort.each do |dir|
-            - if (dir != 'fonts') and (dir[0] != '.')
-              - if dir == Sharkey::Setting['theme']
-                option value="#{dir}" selected="true" = dir
-              - else
-                option value="#{dir}" = dir
+          - get_themes.each do |theme|
+            - if theme == Sharkey::Setting['theme']
+              option value="#{theme}" selected="true" = theme
+            - else
+              option value="#{theme}" = theme
 
         button.btn.btn-primary type="submit" title="Apply"
           span> class="glyphicon glyphicon-picture"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sharkey-web
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Alexandre Dantas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra