diff options
| author | erdgeist <erdgeist@bauklotz.local> | 2009-03-10 19:59:02 +0100 |
|---|---|---|
| committer | erdgeist <erdgeist@bauklotz.local> | 2009-03-10 19:59:02 +0100 |
| commit | d6049aeffc7de43393a9a7a1d2f95f26422a046f (patch) | |
| tree | 7036f509aa4f4a518a00ddb0e12fe8a6eb4d563a /app/views/layouts | |
| parent | 3b3158199f147646348fae0008d3f63062967a87 (diff) | |
| parent | 14ada6b405dac2bea27a2959f6f73a7398776b0b (diff) | |
Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/admin.html.erb | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 840c37c4..bede7813 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb | |||
| @@ -20,7 +20,8 @@ | |||
| 20 | theme_advanced_buttons2 : "", | 20 | theme_advanced_buttons2 : "", |
| 21 | theme_advanced_buttons3 : "", | 21 | theme_advanced_buttons3 : "", |
| 22 | extended_valid_elements : "aggregate[tags|limit|order_by|order_direction|partial]", | 22 | extended_valid_elements : "aggregate[tags|limit|order_by|order_direction|partial]", |
| 23 | relative_urls : false | 23 | relative_urls : false, |
| 24 | entity_encoding : "raw" | ||
| 24 | }); | 25 | }); |
| 25 | </script> | 26 | </script> |
| 26 | </head> | 27 | </head> |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index be7e0449..e6317fdc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -12,10 +12,11 @@ | |||
| 12 | <![endif]--> | 12 | <![endif]--> |
| 13 | </head> | 13 | </head> |
| 14 | <body> | 14 | <body> |
| 15 | <%= render :partial => 'nodes/preview' if params[:action] == "show" %> | ||
| 15 | <div id="logo"> | 16 | <div id="logo"> |
| 16 | <a href="index.html" title="Startseite"><img src="/images/chaosknot.gif" alt="Chaosknoten" /></a> | 17 | <a href="index.html" title="Startseite"><img src="/images/chaosknot.gif" alt="Chaosknoten" /></a> |
| 17 | </div> | 18 | </div> |
| 18 | <!-- HEAD --> | 19 | <!-- HEAD --> |
| 19 | <div id="header"> | 20 | <div id="header"> |
| 20 | <div id="yellow"> | 21 | <div id="yellow"> |
| 21 | </div> | 22 | </div> |
| @@ -25,19 +26,19 @@ | |||
| 25 | <div id="topnav"> | 26 | <div id="topnav"> |
| 26 | <ul id="navlist"> | 27 | <ul id="navlist"> |
| 27 | <li> | 28 | <li> |
| 28 | <a href="<%= params[:locale] %>/club">Kennenlernen</a> | 29 | <%= link_to_path "Kennenlernen", "club" %> |
| 29 | </li> | 30 | </li> |
| 30 | <li> | 31 | <li> |
| 31 | • | 32 | • |
| 32 | </li> | 33 | </li> |
| 33 | <li> | 34 | <li> |
| 34 | <a href="<%= params[:locale] %>/support">Unterstützen</a> | 35 | <%= link_to_path "Unterstützen", "support" %> |
| 35 | </li> | 36 | </li> |
| 36 | <li> | 37 | <li> |
| 37 | • | 38 | • |
| 38 | </li> | 39 | </li> |
| 39 | <li> | 40 | <li> |
| 40 | <a href="<%= params[:locale] %>/contact">Erreichen</a> | 41 | <%= link_to_path "Erreichen", "contact" %> |
| 41 | </li> | 42 | </li> |
| 42 | <% if current_user %> | 43 | <% if current_user %> |
| 43 | <li> | 44 | <li> |