<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/views/admin/settings/_textfield.html.erb</filename>
    </added>
    <added>
      <filename>db/migrate/005_create_settings.rb</filename>
    </added>
    <added>
      <filename>db/migrate/006_create_default_settings.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -3,6 +3,12 @@ class Admin::SettingsController &lt; ApplicationController
   layout 'admin'
   
   def index
-    @settingsgroups = SettingsGroup.find(:all, :order =&gt; 'name ASC')
+    # Render index.html.erb
+  end
+  
+  def update
+    # Do stuff
+    
+    redirect_to :action =&gt; :index
   end
 end
\ No newline at end of file</diff>
      <filename>app/controllers/admin/settings_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,14 +1,18 @@
 class Setting &lt; ActiveRecord::Base
   validates_presence_of :label
-  validates_uniqueness_of :label, :scope =&gt; :settings_group_id
+  validates_uniqueness_of :label
   validates_uniqueness_of :identifier
   
-  belongs_to :settings_group
-  
   # Story any kind of object in the value field.
   # This is nice, but you should also make it editable through admin/settings
   serialize :value
   
+  def self.load(identifier)
+    identifier = identifier.to_s if identifier.is_a?(Symbol)
+    
+    find_by_identifier(identifier)
+  end
+  
   # Return the value for a setting
   def self.get(identifier)
     identifier = identifier.to_s if identifier.is_a?(Symbol)</diff>
      <filename>app/models/setting.rb</filename>
    </modified>
    <modified>
      <diff>@@ -6,15 +6,27 @@
 	&lt;p&gt;
 		There are site-wide settings. They will be used through-out your application.
 	&lt;/p&gt;
+	&lt;p&gt;
+		To add new settings, simple create a migration (see migration #006 for an example), and add  your 
+		settings code here to allow the administrator to edit it.
+	&lt;/p&gt;
 &lt;% end -%&gt;
 
-&lt;% @settingsgroups.each do |sg| %&gt;
-	&lt;h3&gt;&lt;%= sg.name %&gt;&lt;/h3&gt;
+&lt;% form_tag :action =&gt; 'update' do %&gt;
+
+&lt;h3&gt;General&lt;/h3&gt;
 	
-	&lt;% # TODO: (base_app) Find a good way to manage settings of different types. %&gt;
-	&lt;table class=&quot;overview&quot;&gt;
-		&lt;% sg.settings.each do |s| %&gt;
-			&lt;%= cell(s.label, s.value) %&gt;
-		&lt;% end %&gt;
-	&lt;/table&gt;
+&lt;%= render :partial =&gt; 'textfield', :locals =&gt; {:setting =&gt; Setting.load(:site_name)} %&gt;
+&lt;%= render :partial =&gt; 'textfield', :locals =&gt; {:setting =&gt; Setting.load(:company_name)} %&gt;
+&lt;%= render :partial =&gt; 'textfield', :locals =&gt; {:setting =&gt; Setting.load(:site_url)} %&gt;
+
+&lt;h3&gt;Support&lt;/h3&gt;
+	
+&lt;%= render :partial =&gt; 'textfield', :locals =&gt; {:setting =&gt; Setting.load(:support_name)} %&gt;
+&lt;%= render :partial =&gt; 'textfield', :locals =&gt; {:setting =&gt; Setting.load(:support_email)} %&gt;
+
+&lt;div id=&quot;submitbutton&quot;&gt;
+	&lt;p&gt;&lt;%= submit_tag 'Save Settings' %&gt;&lt;/p&gt;
+&lt;/div&gt;
+
 &lt;% end %&gt;</diff>
      <filename>app/views/admin/settings/index.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -408,9 +408,15 @@ table.overview td.label {
 	text-align: right;
 	padding: 8px 12px 8px 0;
 }
+table.overview td.label small {
+	font-weight: normal;
+}
 table.overview td.value {
 	width: 100%;
 }
+table.overview td.value input[type=&quot;text&quot;] {
+	width: 250px;
+}
 table.index td.actions {
 	width: auto;
 }
@@ -633,4 +639,8 @@ div.page_header {
 	margin: 2px;
 	border: 1px solid #eee;
 	color: #ddd;
+}
+#submitbutton {
+	margin: 0.8em;
+	text-align: right;
 }
\ No newline at end of file</diff>
      <filename>public/stylesheets/default.css</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/models/settings_group.rb</filename>
    </removed>
    <removed>
      <filename>db/migrate/005_create_settings_groups.rb</filename>
    </removed>
    <removed>
      <filename>db/migrate/006_create_settings.rb</filename>
    </removed>
    <removed>
      <filename>db/migrate/007_create_default_settings.rb</filename>
    </removed>
    <removed>
      <filename>test/fixtures/settings_groups.yml</filename>
    </removed>
    <removed>
      <filename>test/unit/settings_group_test.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>1ac70783e3744a629baaca07f4f80d67e7d3d308</id>
    </parent>
  </parents>
  <author>
    <name>Ariejan de Vroom</name>
    <email>ariejan@ariejan.net</email>
  </author>
  <url>http://github.com/ariejan/baseapp/commit/4600799ea451c16fe0b94dc2318de6c7a2cdf2a7</url>
  <id>4600799ea451c16fe0b94dc2318de6c7a2cdf2a7</id>
  <committed-date>2008-02-29T05:28:13-08:00</committed-date>
  <authored-date>2008-02-29T05:28:13-08:00</authored-date>
  <message>Better settings</message>
  <tree>967fce276f1258c7aa04d255d3cce70fc2b3d392</tree>
  <committer>
    <name>Ariejan de Vroom</name>
    <email>ariejan@ariejan.net</email>
  </committer>
</commit>
