Merged Master and Flexitypes

sebastiandeutsch · Nov 24, 2009 · 70060d5 · 70060d5
2 parents 41941f6 + 303dba4
commit 70060d5
Showing 58 changed files with 4,966 additions and 383 deletions.
diff --git a/app/controllers/vrame/categories_controller.rb b/app/controllers/vrame/categories_controller.rb
@@ -20,8 +20,6 @@ def index
         end 
       end
     end
-
-    render :show
   end
 
   def sort
@@ -38,18 +36,6 @@ def sort
     render :text => 'ok'
   end
 
-  def show
-    per_page = params[:per_page] || 50
-
-    @category = category_by_language.find(params[:id])
-    @documents = @category.documents
-
-    @categories = @category.children.paginate :page => params[:page], :per_page => per_page
-
-    @breadcrumbs = [{ :title => 'Kategorien', :url => vrame_categories_path }]
-    @category.ancestors.reverse.each { |a| @breadcrumbs << { :title => a.title, :url => vrame_category_path(a) } }
-  end
-
   def new
     @category = current_language.categories.build
     if params[:category_id]

diff --git a/app/helpers/vrame_helper.rb b/app/helpers/vrame_helper.rb
@@ -52,9 +52,9 @@ def to_tree_select_tag(collection, value_method, text_method, options, html_opti
 module VrameHelper
   def category_title(category)
     if category.documents_count > 0
-      "#{category.title} (#{category.documents_count})"
+      "<span class='plain-title'>#{h(category.title)}</span> <span class='documents_count'>(#{category.documents_count})</span>"
     else
-      category.title
+      "<span class='plain-title'>#{h(category.title)}</span>"
     end
   end
 

diff --git a/app/views/layouts/vrame.html.erb b/app/views/layouts/vrame.html.erb
@@ -25,10 +25,10 @@
 		/vrame/stylesheets/rte.css
 		/vrame/stylesheets/jquery-ui-1.7.1/smoothness/jquery-ui-1.7.1.css
 		/stylesheets/vrame_specific.css
-	), :cache => true %>
+	), :cache => 'vrame_all' %>
 
-	<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/vrame/stylesheets/admin/ie/ie6.css" /><![endif]-->
-	<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/vrame/stylesheets/admin/ie/ie7.css" /><![endif]-->
+	<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/vrame/stylesheets/ie/ie6.css" /><![endif]-->
+	<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/vrame/stylesheets/ie/ie7.css" /><![endif]-->
 
 	<%= javascript_include_tag %w(
 		/vrame/javascripts/jquery/jquery-1.3.2.min.js
@@ -39,14 +39,18 @@
 		/vrame/javascripts/jquery/jquery.rte.js
 		/vrame/javascripts/jquery/jquery.droppy.js
 		/vrame/javascripts/jquery/jquery.tipsy.js
+		/vrame/javascripts/jquery/jquery.placeholder.js
 		/vrame/javascripts/jquery/jquery.scrollTo-1.4.2-min.js
 		/vrame/javascripts/swfupload/swfupload.js
 		/vrame/javascripts/application.js
 		/vrame/javascripts/asset-list.js
 		/vrame/javascripts/upload.js
+		/vrame/javascripts/asset-list.js
+		/vrame/javascripts/category-view.js
 		/vrame/javascripts/placemarks.js
 		/vrame/javascripts/schema-builder.js
-	), :cache => true %>
+		/vrame/javascripts/unsaved-alert.js
+	), :cache => 'vrame_all' %>
 
 	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>
 </head>

diff --git a/app/views/nine_auth/backend/users/index.html.erb b/app/views/nine_auth/backend/users/index.html.erb
@@ -0,0 +1,22 @@
+<div class="subnavigation clearfix">
+	<h2>Alle Benutzer</h2>
+	<div class="functions">
+		<%= link_to "&raquo; Neuer Benutzer", new_backend_user_path %>
+	</div>
+</div>
+<ul id="category-list" class="category record-list">
+	<% for user in @users do %>
+	<li class="row clearfix">
+	<div class="column title">
+		<span>
+			<%= link_to user.email, backend_user_path(user) %>
+		</span>
+	</div>
+	<div class="column options">
+		<a href="javascript:void(0);"><img src="/vrame/images/admin/led-<%= if user.active then 'green' else 'red' end %>.png" alt="" /></A>
+		<%= link_to '<img src="/vrame/images/admin/edit.png" border="0" alt="Editieren" title="Editieren" />', edit_backend_user_path(user) %>
+		<%= link_to '<img src="/vrame/images/admin/delete.png" border="0" alt="Löschen" title="Löschen" />', [:backend, user], :method => :delete, :confirm => 'Wirklich löschen?' %>
+	</div>
+	</li>
+	<% end %>
+</ul>
diff --git a/app/views/nine_auth/backend/users/show.html.erb b/app/views/nine_auth/backend/users/show.html.erb
@@ -0,0 +1,18 @@
+<h2>Benutzer <%=h @user.email %></h2>
+
+<table width="100%">
+	<tr>
+		<td><strong>E-Mail:</strong></td>
+		<td><%=h @user.email %></td>
+	</tr>
+	<tr>
+		<td><strong>Aktiv:</strong></td>
+		<td><img src="/vrame/images/admin/led-<%= if @user.active then 'green' else 'red' end %>.png" alt="" /></td>
+	</tr>
+	<tr>
+		<td><strong>Administrator:</strong></td>
+		<td><img src="/vrame/images/admin/led-<%= if @user.admin then 'green' else 'red' end %>.png" alt="" /></td>
+	</tr>
+</table><br />
+
+<%= link_to 'Benutzer bearbeiten', edit_backend_user_path(@user) %>
diff --git a/app/views/vrame/assets/edit.html.erb b/app/views/vrame/assets/edit.html.erb
@@ -48,7 +48,7 @@
 	<fieldset>
 		<ul>
 			<li class="last">
-				<%= f.submit 'Speichern' %> oder <%= link_to '&laquo; zurück', vrame_assets_path %>
+				<%= f.submit 'Speichern', :class => 'submit' %> oder <%= link_to '« zurück', vrame_assets_path %>
 			</li>
 		</ul>
 	</fieldset>

diff --git a/app/views/vrame/categories/_category.html.erb b/app/views/vrame/categories/_category.html.erb
@@ -0,0 +1,34 @@
+<div
+	data-category-id="<%= category.to_param %>"
+	class="category clearfix level-<%= level.to_s %> <%= 'active-category' if @active_category.id == category.id %>">
+
+	<div class="column order">
+		<%= link_to '<img src="/vrame/images/admin/arrow_up.png" alt="Nach oben verschieben" title="Nach oben verschieben" />', [:order_up, :vrame, category] %>
+		<%= link_to '<img src="/vrame/images/admin/arrow_down.png" alt="Nach unten verschieben" title="Navh unten verschieben" />', [:order_down, :vrame, category] %>
+	</div>
+
+	<div class="column options">
+		<% if category.published %>
+			<%= link_to '<img src="/vrame/images/admin/led-green.png" alt="Verstecken" title="Verstecken" />', [:unpublish, :vrame, category] %>
+		<% else %>
+			<%= link_to '<img src="/vrame/images/admin/led-red.png" alt="Veröffentlichen" title="Veröffentlichen" />', [:publish, :vrame, category] %>
+		<% end %>
+		<%= link_to '<img src="/vrame/images/admin/edit.png" alt="Editieren" title="Editieren" />', [:edit, :vrame, category] %>
+		<%= link_to '<img src="/vrame/images/admin/delete.png" alt="Löschen" title="Löschen" />', [:vrame, category], :method => :delete, :confirm => 'Wirklich löschen?' %>
+		<%= link_to '<img src="/vrame/images/admin/page_add.png" alt="Dokument hinzufügen" title="Dokument hinzufügen" />',
+			category.backend_url.empty? ? [:new, :vrame, category, :document] : category.backend_url_path + '/new'
+		%>
+		<%= link_to '<img src="/vrame/images/admin/magnifier.png" alt="Vorschau" title="Vorschau" />',
+			category.url.empty? ? category : "/#{category.url}"
+		%>
+	</div>
+
+	<div class="column title">
+		<% if category.backend_url.empty? %>
+			<%= link_to category_title(category), category, :class => "category-button" %>
+		<% else %>
+			<%= link_to category_title(category), category.backend_url_path, :class => 'backend-url' %>
+		<% end %>
+	</div>
+
+</div><!-- /.category -->
diff --git a/app/views/vrame/categories/_documents.html.erb b/app/views/vrame/categories/_documents.html.erb
@@ -1,65 +1,70 @@
 <ul id="ui-sortable">
-	<% documents.each do |document| %>
-		<li id="document-<%=h document.id %>" class="document clearfix">
-			<div class="column title">
-				<span>
-					<%= link_to h(document.title), [:edit, :vrame, document] %>
-				</span>
-			</div>
-
-			<div class="image">
-				<% if document.meta and document.meta.schema.has_field?(:image) %>
-					<img src="<%= document.meta.image.file.url(:vrame_backend) %>" />
-				<% elsif document.meta and document.meta.schema.has_field?(:bild) %>
-					<img src="<%= document.meta.bild.file.url(:vrame_backend) %>" />
-				<% else %>
-					&nbsp;
-				<% end %>
-			</div>
-
-			<div class="column slug" title="Numerische ID: <%=h document.id %>">
-				<%= link_to h(document.to_param), document %>
-			</div>
-
-			<div class="column options">
-				<% if document.published %>
-					<%= link_to '<img src="/vrame/images/admin/led-green.png" border="0" alt="Verstecken" title="Verstecken" />', [:unpublish, :vrame, document] %>
-				<% else %>
-					<%= link_to '<img src="/vrame/images/admin/led-red.png" border="0" alt="Veröffentlichen" title="Veröffentlichen" />', [:publish, :vrame, document] %>
-				<% end %>
-				<%= link_to '<img src="/vrame/images/admin/edit.png" border="0" alt="Editieren" title="Editieren" />', [:edit, :vrame, document] %>
-				<%= link_to '<img src="/vrame/images/admin/delete.png" border="0" alt="Löschen" title="Löschen" />', [:vrame, document], :method => :delete, :confirm => 'Wirklich löschen?' %>
-			</div>
-		</li>
-	<% end %>
-	<% if category != nil and documents.size == 0 %>
-		<li class="document clearfix">
-			<div class="column">
-				Die Kategorie "<%=h category.title %>" enthält noch keine Dokumente. Wollen Sie ein <%= link_to "Dokument hinzufügen", category.backend_url.empty? ? [:new, :vrame, category, :document] : category.backend_url_path + '/new' %>?
-			</div>
-		</li>
+<% documents.each do |document| %>
+
+	<% image = nil %>
+	<% %w(image bild photo foto).each do |field_name| %>
+		<% next unless document.meta.schema.has_field?(field_name) %>
+		<% field = document.meta.send[field_name] %>
+		<% if field.file.file? %>
+			<% image = image_tag(field.file.url(:vrame_backend), :alt => '') %>
+			<% break %>
+		<% end %>
 	<% end %>
+
+	<li id="document-<%=h document.id %>" class="document clearfix">
+
+		<div class="column title <%= 'long-title' unless image %>">
+			<%= link_to h(document.title), [:edit, :vrame, document], :title => 'Editieren' %>
+		</div>
+
+		<% if image %>
+			<div class="column image"><%= image %></div>
+		<% end %>
+
+		<div class="column slug">
+			<%= link_to h(document.to_param), [:edit, :vrame, document], :title => 'Editieren' %>
+		</div>
+
+		<div class="column options">
+			<% if document.published %>
+				<%= link_to '<img src="/vrame/images/admin/led-green.png" alt="Verstecken" title="Verstecken" />', [:unpublish, :vrame, document] %>
+			<% else %>
+				<%= link_to '<img src="/vrame/images/admin/led-red.png" alt="Veröffentlichen" title="Veröffentlichen" />', [:publish, :vrame, document] %>
+			<% end %>
+			<%= link_to '<img src="/vrame/images/admin/edit.png" alt="Editieren" title="Editieren" />', [:edit, :vrame, document] %>
+			<%= link_to '<img src="/vrame/images/admin/delete.png" alt="Löschen" title="Löschen" />', [:vrame, document], :method => :delete, :confirm => 'Wirklich löschen?' %>
+			<%= link_to '<img src="/vrame/images/admin/magnifier.png" alt="Vorschau" title="Vorschau" />', document %>
+		</div>
+	</li>
+<% end %>
+<% if category != nil and documents.size == 0 %>
+	<li class="document clearfix">
+		<div class="column add-document">
+			Die Kategorie „<%=h category.title %>“ enthält noch keine Dokumente. Wollen Sie ein <%= link_to "Dokument hinzufügen", category.backend_url.empty? ? [:new, :vrame, category, :document] : category.backend_url_path + '/new' %>?
+		</div>
+	</li>
+<% end %>
 </ul>
 
 <% if documents.first %>
 	<script type="text/javascript">
-		jQuery(function($) {
-			$("#ui-sortable").sortable({
-				update: function(event, ui) {
-					var data = $("#ui-sortable").sortable('serialize');
-
-					$('#ajax-loading-bar').fadeIn('fast');
-					$.ajax({
-						type: "POST",
-						url: "/vrame/categories/<%=h documents.first.category.id %>/sort",
-						processData: false,
-						data: data + '&authenticity_token=' + encodeURIComponent('<%= form_authenticity_token if protect_against_forgery? %>'),
-						success: function(msg) {
-							$('#ajax-loading-bar').stop().fadeOut('fast');
-						}
-					});
+	jQuery(function($) {
+		$("#ui-sortable").sortable({
+			update: update
+		});
+		function update (event, ui) {
+			var data = $("#ui-sortable").sortable('serialize');
+			$('#ajax-loading-bar').fadeIn('fast');
+			$.ajax({
+				type: "POST",
+				url: "/vrame/categories/<%=h documents.first.category.id %>/sort",
+				processData: false,
+				data: data + '&authenticity_token=' + encodeURIComponent('<%= form_authenticity_token if protect_against_forgery? %>'),
+				success: function(msg) {
+					$('#ajax-loading-bar').stop().fadeOut('fast');
 				}
 			});
-		});
-	</script>
+		}
+	});
+</script>
 <% end %>
diff --git a/app/views/vrame/categories/_form.html.erb b/app/views/vrame/categories/_form.html.erb
@@ -110,7 +110,7 @@
 
 	<ul>
 		<li class="last">
-			<%= f.submit 'Speichern' %> oder <%= link_to '&laquo; zurück', vrame_categories_path %>
+			<%= f.submit 'Speichern', :class => 'submit' %> oder <%= link_to '« zurück', vrame_categories_path %>
 		</li>
 	</ul>
 

diff --git a/app/views/vrame/categories/index.html.erb b/app/views/vrame/categories/index.html.erb
@@ -0,0 +1,20 @@
+<div class="subnavigation clearfix">
+	<div class="functions">
+		<%= link_to 'Neues Dokument', new_vrame_category_document_path(@active_category), :class => 'button', :id => 'active-category-new-document' %>
+		<%= link_to 'Neue Unterkategorie', new_vrame_category_category_path(@active_category), :class => 'button', :id => 'active-category-new-category' %>
+		<%= link_to 'Kategorie editieren', edit_vrame_category_path(@active_category), :class => 'button', :id => 'active-category-edit' %>
+	</div>
+
+	<h2>Kategorie-Übersicht <span id="active-category-name"></span></h2>
+</div>
+
+<div class="content-view clearfix" class="clearfix">
+	<div class="categories">
+		<% category_tree @categories do |category, level| %>
+			<%= render :partial => 'vrame/categories/category', :locals => { :category => category, :level => level } %>
+		<% end %>
+	</div>
+	<div id="items" class="items">
+		<%= render :partial => 'vrame/categories/documents', :locals => { :documents => @documents, :category => @active_category } %>
+	</div>
+</div>
diff --git a/app/views/vrame/categories/show.html.erb b/app/views/vrame/categories/show.html.erb
diff --git a/app/views/vrame/documents/_form.html.erb b/app/views/vrame/documents/_form.html.erb
@@ -80,7 +80,7 @@
 
 	<ul>
 		<li class="last">
-			<%= f.submit 'Speichern' %> oder <%= link_to '&laquo; zurück', vrame_categories_path %>
+			<%= f.submit 'Speichern', :class => 'submit' %> oder <%= link_to '« zurück', vrame_categories_path %>
 		</li>
 	</ul>
 

diff --git a/app/views/vrame/languages/_form.html.erb b/app/views/vrame/languages/_form.html.erb
@@ -9,7 +9,7 @@
 			<%= f.text_field :iso3_code %> <em><%= f.error_message_on :iso3_code %></em>
 		</li>
 		<li class="last">
-			<%= f.submit 'Speichern' %> oder <%= link_to '&raquo; zurück', admin_languages_path %>
+			<%= f.submit 'Speichern', :class => 'submit' %> oder <%= link_to '« zurück', admin_languages_path %>
 		</li>
 	</ul>
 <% end %>