Merge branch 'master' of github.com:concerto/concerto

concerto · Jun 12, 2012 · c92350e · c92350e
2 parents 5487d2d + bce0fd8
commit c92350e
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 139 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -2,6 +2,11 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :set_locale
   before_filter :check_for_initial_install
+  before_filter :set_version
+
+  def set_version
+    require 'concerto/version'
+  end
 
   def set_locale
     if user_signed_in? && current_user.locale != ""

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -1,3 +1,4 @@
+<%= devise_error_messages! %>
 <section class="C no">
 	<header>
 		<%= back_button :back %>
@@ -7,8 +8,6 @@
     <article>
 
 			<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-				<%= devise_error_messages! %>
-
 				<fieldset>
 					<div class="field">
 					  <%= f.label :first_name %>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -3,6 +3,9 @@
     <%= render 'form' %>
   </div>
 <% else %>
+  <% if flash[:alert] %>
+    <p class="alert"><%= alert %></p>
+  <% end %>
   <section class="C no">
   	<header>
   		<%= back_button :back %>

diff --git a/app/views/elements/_topmenu_contents.html.erb b/app/views/elements/_topmenu_contents.html.erb
@@ -2,19 +2,49 @@
   <a href="#">-- Show Top Menu --</a>
 </nav>
 
-<!--googleoff: all-->
 <nav id="TM">
   <% if not user_signed_in? %>
     <%= link_to "Concerto", "/", :id => "TM-logobutton" %>
-    <p id="TM-logintext"><%= link_to t(:sign_in), new_user_session_path, :id => "login-dropdown" %> <%=t(:signin_login_spiel) %> <% if ConcertoConfig[:allow_registration] == "true" %>No account? <%= link_to t(:sign_up), new_user_registration_path %> now!<% end %></p>
+    <p id="TM-logintext">
+      <%= link_to t(:sign_in), new_user_session_path, :id => "login-dropdown" %> <%=t(:signin_login_spiel) %>
+      <% if can? :create, User %>
+        No account? <%= link_to t(:sign_up), new_user_registration_path %> now!
+      <% end %>
+    </p>
+    <script type="text/javascript">
+    $(document).ready(function() {
+      $("#login-dropdown").each(function() {
+        $(this).qtip({
+          content: {
+            text: 'Loading...', // use this text while loading content via AJAX
+            ajax: {
+              url: '<%= new_user_session_path(:no_content_cell => 1) %>',
+              type: 'GET'
+            }
+          },
+          position: {
+            at: 'bottom center', // Position the tooltip above the link
+            my: 'top left',
+            viewport: $(window) // Keep the tooltip on-screen at all times
+          },
+          show: {
+            event: 'click', // Show it on click...
+            solo: true // ...and hide all other tooltips...
+          },
+          hide: 'unfocus',
+          style: 'ui-tooltip-light ui-tooltip-shadow ui-tooltip-rounded ui-tooltip-nopadding ui-tooltip-autowidth'
+        })
+      }).click(function(e) { e.preventDefault(); });
+    });
+    </script>
   <% else %>
-    <%= link_to "Concerto", "/", :id => "TM-logobutton", :class => "full" %>
+    <%= link_to "Concerto", root_url, :id => "TM-logobutton", :class => "full" %>
 
   <!-- Begin Menu for CONTENT -->
   <section>
   <div class="TM-sectop">
     <%= link_to t(:browse), feeds_path, :class => "btn #{ current_page?(feeds_path) || (controller.controller_name == 'submissions' && ['index', 'show'].include?(controller.action_name)) ? 'selected' : '' }" %>
-    <%= link_to t(:add), new_content_path, :class => "btn #{ current_page?(new_content_path) ? 'selected' : '' }" %>
+    <%= link_to t(:add), new_content_path, :class => "btn #{ current_page?(new_content_path) ? 'selected' : '' }" if can? :create, Content %>
   </div>
   <div class="TM-secbot">
     <h1><%= t(:content) %></h1>
@@ -64,44 +94,3 @@
   <% end %>
   <div class="clear"></div>
 </nav>
-
-<script type="text/javascript">
-
-  $(document).ready(function() {
-
-    $("#login-dropdown").each(function() {
-
-      $(this).qtip({
-        content: {
-          text: 'Loading...', // use this text while loading content via AJAX
-      		ajax: {
-      			url: '/users/sign_in?no_content_cell=1', 
-      			type: 'GET'
-      		}
-        },
-
-        position: {
-          at: 'bottom center', // Position the tooltip above the link
-          my: 'top left',
-          viewport: $(window) // Keep the tooltip on-screen at all times
-        },
-
-        show: {
-          event: 'click', // Show it on click...
-          solo: true // ...and hide all other tooltips...
-        },
-
-        hide: 'unfocus',
-        style: 'ui-tooltip-light ui-tooltip-shadow ui-tooltip-rounded ui-tooltip-nopadding ui-tooltip-autowidth'
-
-      })
-
-    })
-
-    .click(function(e) { e.preventDefault(); });
-
-  });
-
-</script>
-
-<!--googleon: all-->
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,7 +2,8 @@
 <html>
 <head>
   	<title><%= yield_for_title(controller.controller_name.titleize) %> - Concerto Panel</title>
-
+	<meta name="generator" content="Concerto <%= Concerto::VERSION::STRING %>" />
+	<meta name="application-name" content="Concerto" />
   	<%= stylesheet_link_tag "application" %>
 	<%= javascript_include_tag "application" %>
 

diff --git a/app/views/users/_show_body.html.erb b/app/views/users/_show_body.html.erb
@@ -1,68 +1,94 @@
 <article>
   <div class="default-padding">
-    <h2>Groups</h2>
-
-    <table>
-      <tr>
-        <th>Name</th>
-  			<th>Roles</th>
-  		</tr>
-
-      <% @user.memberships.each do |membership| %>
-      <tr>
-        <td><%= membership.group.name %></td>
-
-        <td>
-          <%= form_for([membership.group, membership]) do |f| %>
-            <%= f.select :level, Membership::LEVELS %>
-            <%= f.submit %>
-          <% end %>
-        </td>
-      </tr>
-      <% end %>
-    </table>
-
-    <br/><br/>
-
-    <h2>Screens</h2>
-
-    <table>
-      <tr>
-        <th>Name</th>
-        <th>Location</th>
-        <th>Dimensions</th>
-      </tr>
-
-    <% @user.screens.each do |screen| %>
-      <tr>
-        <td><%= screen.name %></td>
-        <td><%= screen.location %></td>
-        <td><%= screen.width %> X <%= screen.height %></td>
-      </tr>
-      <% end %>
-    </table>
-
-    <br/><br/>
-
-    <h2>Submissions</h2>
-
-    <table>
-      <tr>
-        <th>Name</th>
-  			<th>Type</th>
-  			<th>Airs</th>
-  		</tr>
-
-    <% @user.contents.each do |content| %>
-      <tr>
-        <td><%= content.name %></td>
-        <td><%= content.type %></td>
-        <td><%= content.start_time %> - <%= content.end_time %></td>
-      </tr>
-      <% end %>
-    </table>
-
-    <br/><br/>
+    <% if !@user.memberships.empty? %>
+      <h2>Groups</h2>
+
+      <table>
+        <tr>
+          <th>Name</th>
+    			<th>Roles</th>
+    		</tr>
+
+        <% @user.memberships.each do |membership| %>
+          <tr>
+            <td><%= membership.group.name %></td>
+
+            <td>
+              <%= form_for([membership.group, membership]) do |f| %>
+                <%= f.select :level, Membership::LEVELS %>
+                <%= f.submit %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </table>
+
+      <br/><br/>
+    <% end %>
+
+    <% if !@user.screens.empty? %>
+      <h2>Screens</h2>
+
+      <table>
+        <tr>
+          <th>Name</th>
+          <th>Location</th>
+          <th>Dimensions</th>
+        </tr>
+
+        <% @user.screens.each do |screen| %>
+          <tr>
+            <td><%= screen.name %></td>
+            <td><%= screen.location %></td>
+            <td><%= screen.width %> X <%= screen.height %></td>
+          </tr>
+        <% end %>
+      </table>
+
+      <br/><br/>
+    <% end %>
+
+    <% Group.joins(:screens, :users).where(:users => {:id => @user}).group('groups.id').each do |group| %>
+      <h2><%= group.name %>'s Screens</h2>
+
+      <table>
+        <tr>
+          <th>Name</th>
+          <th>Location</th>
+          <th>Dimensions</th>
+        </tr>
+
+        <% group.screens.each do |screen| %>
+          <tr>
+            <td><%= screen.name %></td>
+            <td><%= screen.location %></td>
+            <td><%= screen.width %> X <%= screen.height %></td>
+          </tr>
+        <% end %>
+      </table>
+      <br/><br/>
+    <% end %>
+
+    <% if !@user.contents.empty? %>
+      <h2>Submissions</h2>
+
+      <table>
+        <tr>
+          <th>Name</th>
+    			<th>Type</th>
+    			<th>Airs</th>
+    		</tr>
+
+      <% @user.contents.each do |content| %>
+        <tr>
+          <td><%= content.name %></td>
+          <td><%= content.type %></td>
+          <td><%= content.start_time %> - <%= content.end_time %></td>
+        </tr>
+        <% end %>
+      </table>
+      <br/><br/>
+    <% end %>
 
   </div>
 

diff --git a/db/migrate/20120418012853_create_players.rb b/db/migrate/20120418012853_create_players.rb
diff --git a/db/migrate/20120418142310_remove_players.rb b/db/migrate/20120418142310_remove_players.rb
diff --git a/lib/concerto/version.rb b/lib/concerto/version.rb
@@ -0,0 +1,10 @@
+module Concerto
+  module VERSION
+    MAJOR = 2
+    MINOR = 'x'
+    TINY = 'x'
+    PRE = nil
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  end
+end