working settings page

nesquena · Dec 5, 2011 · af45aa1 · af45aa1
1 parent 5b9a855
commit af45aa1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 11 deletions.
diff --git a/lib/gitdocs.rb b/lib/gitdocs.rb
@@ -9,7 +9,6 @@
 require 'yajl'
 require 'dante'
 
-
 module Gitdocs
 
   DEBUG = ENV['DEBUG']

diff --git a/lib/gitdocs/migration/001_create_shares.rb b/lib/gitdocs/migration/001_create_shares.rb
@@ -3,7 +3,7 @@ def self.up
     create_table :shares do |t|
       t.column :path, :string
       t.column :polling_interval, :integer, :default => 15
-      t.column :notifications, :boolean, :default => true
+      t.column :notification, :boolean, :default => true
     end
   end
 

diff --git a/lib/gitdocs/public/css/app.css b/lib/gitdocs/public/css/app.css
@@ -17,6 +17,15 @@ body h2 { font-size: 1.5em; margin-top: 0.2em; }
   text-align: center;
 }
 
+.nav h1 a {
+	text-decoration: none;
+	color: black;
+}
+
+.nav h1 a:hover {
+	text-decoration: none;
+}
+
 .menu {
   margin-top :10px;
   display: absolute;

diff --git a/lib/gitdocs/runner.rb b/lib/gitdocs/runner.rb
@@ -5,7 +5,7 @@ class Runner
     def initialize(share)
       @share = share
       out, status = sh_with_code "which growlnotify"
-      @use_growl = share.notifications && status.success?
+      @use_growl = share.notification && status.success?
       @root = share.path
       @polling_interval = share.polling_interval
       @icon = File.expand_path("../../img/icon.png", __FILE__)

diff --git a/lib/gitdocs/server.rb b/lib/gitdocs/server.rb
@@ -10,15 +10,16 @@ def initialize(config, *gitdocs)
     end
 
     def start(port = 8888)
-      gds = @gitdocs.sort { |a, b| a.root <=> b.root }
+      gds = @gitdocs
+      conf = @config
       Thin::Server.start('127.0.0.1', port) do
         use Rack::Static, :urls => ['/css', '/js', '/img', '/doc'], :root => File.expand_path("../public", __FILE__)
         run Renee {
           if request.path_info == '/'
             render! "home", :layout => 'app', :locals => {:gds => gds}
           else
             path 'settings' do
-              get.render! 'settings', :layout => 'app', :locals => {:config => @config}
+              get.render! 'settings', :layout => 'app', :locals => {:conf => conf}
             end
 
             var :int do |idx|

diff --git a/lib/gitdocs/views/app.haml b/lib/gitdocs/views/app.haml
@@ -12,9 +12,10 @@
   %body
     .nav
       %h1
-        %img{ :src => "/img/git_logo.png", :width => 30, :height => 30}
-        Gitdocs
-        =Gitdocs::VERSION
+        %a{:href => '/'}
+          %img{ :src => "/img/git_logo.png", :width => 30, :height => 30}
+          Gitdocs
+          =Gitdocs::VERSION
     .container
       = preserve(yield)
 

diff --git a/lib/gitdocs/views/settings.haml b/lib/gitdocs/views/settings.haml
@@ -1,5 +1,17 @@
 %h1 Settings
 
-%dl
-  %dt 
-  %dd 
+%h2 Shares
+
+-conf.shares.each_with_index do |share, idx|
+  %div{:id => "share-#{idx}", :class => 'share'}
+    %dl
+      %dt Path
+      %dd #{share.path}
+    %dl
+      %dt Polling interval
+      %dd #{share.polling_interval}
+    %dl
+      %dt Notifications?
+      %dd #{share.notification}
+
+