Index: app/helpers/theme_helper.rb =================================================================== --- app/helpers/theme_helper.rb (revision 1324) +++ app/helpers/theme_helper.rb (working copy) @@ -21,3 +21,11 @@ super end end + +def tab(label, options = {}) + if controller.controller_name =~ /#{options[:controller].split('/').last}/ || controller.action_name =~ /#{options[:controller].split('/').last}/ + content_tag :li, link_to(label, options, {"class"=> "active"}), {"class"=> "active"} + else + content_tag :li, link_to(label, options) + end +end \ No newline at end of file Index: app/views/admin/general/index.rhtml =================================================================== --- app/views/admin/general/index.rhtml (revision 1324) +++ app/views/admin/general/index.rhtml (working copy) @@ -1,248 +1,262 @@ - <% @page_heading = 'Blog settings' %> + <% @page_heading = 'Blog settings' %> + + <% form_tag :action => 'update' do %> - <% form_tag :action => 'update' do %> - -
-

Which settings group would you like to edit?

- -
+
+

Which settings group would you like to edit?

+ +

-
-
-

General Settings

-

- - -

-

- - -

-

- /> -
- /> -
- /> - -

-

- - -

-

- /> - - -

-

- /> - - -

-

- - articles on my homepage by default. -

-

- - articles in my rss feed by default. -

-

- /> - - -

+
+
+ General settings -
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + Display your lattitude and longitude information (exemple 47.774,-122.201) +
    • +
  • + + /> + + + /> + + + + /> + + +
    • +
+

<%= save("Save My Settings") %>

+
-

Should the blog show mailto: links to your email address?

-

/>

+
+ Read -
+
    +
  • + + + articles on my homepage by default +
    • +
  • + + + articles in my rss feed by default. +
    • +
  • + + /> + +
    • +
+

<%= save("Save My Settings") %>

+
-

Should the blog use of the Globally Recognized Avatar (Gravatar) service in comments?

-

- /> - - -

+
+ Write + +
    +
  • + + +
    • +
  • + + + To add new filters, see the "filters" tab on the toolbar above. +
    • +
  • +

    When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.

    + + /> + +
    • +
  • + + +
    • +
+

<%= save("Save My Settings") %>

+
-
+
+ Discuss +
    +
  • +

    This setting allows you to disable trackbacks for every article in your blog. It won't remove existing trackbacks, but it will prevent any further attempt to add a trackback anywhere on your blog.

    + + /> + +
    • +
  • + + /> + +
    • +
  • + + /> + +
    • +
  • + + /> + +
    • +
  • + + /> + +
    • +
  • +

    You can optionally disable non-Ajax comments. Typo will always use Ajax for comment submission if Javascript is enabled, so non-Ajax comments are either from spammers or users without Javascript.

    + + + /> + +
    • +
  • + + days + Set to 0 to never disable comments +
    • +
  • +

    Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them.

    + + links + Set to 0 to never reject comments +
    • +
-

Would you like to include your latitude and longitude in your blog's HTML pages? See GeoURL for details.
Example: 47.774,-122.201

- -

- - -

- -
- -

This setting allows you to disable trackbacks for every article in - your blog. It won't remove existing trackbacks, but it will prevent - any further attempt to add a trackback anywhere on your blog. You can - enable or disable trackbacks per-article using the article's extended - settings. See also the - "Enable Trackbacks by default" setting above. -

-

- /> - - - -

- -
- -

Should Typo send trackbacks to websites that you link to? This should be disabled - for private blogs, as it will leak non-public information to sites that you're discussing. - For public blogs, there's no real point in disabling this.

-

- /> - - - -

- -

-
- -

- -

<%= save("Save My Settings") %>

-
- - -
-

Text Filter

-

Typo supports a number of text filtering options. To add new filters, see the "filters" tab on the toolbar above.

-

- - -

-

- - -

<%= save("Save My Settings") %>

-
+ -
-

Notification

-

Typo can notify you when new articles or comments are posted

-

- - -

-

- - -

-

- - -

+
+ Notification +
    +
  • Typo can notify you when new articles or comments are posted
    • +
  • + + + Email address used by Typo to send notifications. +
    • +
  • + + + Jabber account to use when sending Jabber notifications. +
    • +
  • + + +
    • +

<%= save("Save My Settings") %>

-
+ +
+ Spam protection + +
    +
  • Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots.
    • +
  • + + /> +
    • +
  • Typo can (optionally) use the Akismet spam-filtering service. You need to register with + Akismet and receive an API key before you can use their service. If you have an Akismet key, enter it here.
    • +
  • + + +
    • +

    <%= save("Save My Settings") %>

    +
+
-
-

Spam Protection

-

Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots.

-

- /> - -

-

Typo can (optionally) use the Akismet spam-filtering service. You need to register with - Akismet and receive an API key before you can use their service. If you have an Akismet key, enter it here. -

-

- - -

-

You can optionally disable non-Ajax comments. Typo will always use Ajax for comment submission if Javascript is enabled, - so non-Ajax comments are either from spammers or users without Javascript. -

-

- /> - - -
(Spam bots usually don't know anything about ajax comments) -

-

- - days -
(Set to 0 to never disable comments) -

-

Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them.

-

- - links -
(Set to 0 to never reject comments) -

-

<%= save("Save My Settings") %>

-
-
-

Resource Defaults

-

- The below settings act as defaults when you choose to publish an enclosure with iTunes metadata. -

-

- - -

-

- - (setting for channel) -

-

-
- -

-

- - Not Published by Apple -

-

- - Not Published by Apple +

+ Resource Settings -

-

- - -

-

- - /> -

+
    +
  • The below settings act as defaults when you choose to publish an enclosure with iTunes metadata.
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + Setting for channel +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + Not published by Apple +
    • +
  • + + +
    • +
  • + + /> + +
    • +

<%= save("Save My Settings") %>

-
-
+ + +
+ Cache +
    +
  • <%= link_to 'Empty Fragment Cache', :controller => '/admin/cache', :action => 'sweep' %>
    • +
  • <%= link_to 'Rebuild cached HTML', :controller => '/admin/cache', :action => 'sweep_html' %>
    • +

    There are <%= @page_cache_size %> entries in the cache

    +
+
-
-

Cache

- <%= link_to 'Empty Fragment Cache', :controller => '/admin/cache', :action => 'sweep' %>
- <%= link_to 'Rebuild cached HTML', :controller => '/admin/cache', :action => 'sweep_html' %>
-
-

There are <%= @page_cache_size %> entries in the cache

-
-
- -
<%= save("Save My Settings") %>
Index: public/stylesheets/administration.css =================================================================== --- public/stylesheets/administration.css (revision 1324) +++ public/stylesheets/administration.css (working copy) @@ -325,7 +325,6 @@ .set { background: #F8F7EF; - border: 1px dotted #7D8692; padding: 0 10px 5px 10px; margin-bottom: 10px; position: relative; @@ -335,6 +334,42 @@ } +#settings legend { + font-size: 130%; +} + +#settings ul { + margin: 0; + padding: 0; +} + +#settings li { + list-style: none; + padding: 5px; + margin: 0; + clear:both; +} + +#settings label.float { + display: block; + float: left; + width: 180px; + margin-right: 20px; + padding: 0; + text-align: right; +} + +#settings input.float { + width:auto; +} + +#settings span.float { + margin-left: 200px; + padding: 0; + display: block; + clear: both; +} + /* * =SIDEBAR */