Made links skip 'dumb' search page and go straight to movies, adjusted styling for filter controls, made movies display title with article in front, added title to a few search buttons, fixed bug with sort filters disappearing, changed jqueryui font to AftasansRegular instead of Candara

Author: unknown

app/assets/javascripts/home.js.coffee

@@ -43,13 +43,13 @@ jQuery ->
     for actor in dataactors
       data.push(
         label: actor.firstname + " " + actor.lastname
-        value: "actors/" + actor.id
+        value: "movies?actor=" + actor.firstname + " " + actor.lastname
         category: "Actor"
       )
     for genre in datagenres
       data.push(
         label: genre.name
-        value: "genres/" + genre.id
+        value: "movies?genre=" + genre.name
         category: "Genre"
       )
     console.log(datamovies)
@@ -60,5 +60,6 @@ jQuery ->
           event.preventDefault()
           $(this).catcomplete("close")
           $(this).val(ui.item.label)
-          location.pathname = ui.item.value
+          console.log(ui.item.value)
+          location.assign(ui.item.value)
     )

app/assets/javascripts/movies.js.coffee

@@ -9,12 +9,6 @@ jQuery ->
       noneSelectedText: "Select actors",
       selectedText: "# actors selected"
     ).multiselectfilter()
-    $("select#genre").multiselect(
-      multiple: false,
-      selectedList: 1,
-      header: "Select a genre",
-      noneSelectedText: "Select a genre"
-    )
     $("#filters-toggle").click( ->
       $("#new-filters").toggle("blind")
     )

app/assets/stylesheets/home.css.scss

@@ -241,6 +241,16 @@ p.info {
 #filters-toggle {
   text-align: center;
   cursor: pointer;
+  font-size: 16px;
+  padding: 0;
+}
+#new-filters {
+  padding: 5px;
+}
+#filters-toggle > span:first-child {
+  display: inline-block;
+  margin-right: 16px;
+  margin-top: 0.2em;
 }
 
 @media screen and (max-width: 650px) {

app/assets/stylesheets/jquery-ui-1.10.1.custom.css

@@ -1,7 +1,7 @@
 /*! jQuery UI - v1.10.1 - 2013-02-18
 * http://jqueryui.com
 * Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Candara%2CArial%2Csans-serif&fwDefault=normal&fsDefault=14px&cornerRadius=5px&bgColorHeader=%230a7694&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=%2300bff3&fcHeader=%23eaf5f7&iconColorHeader=%23d8e7f3&bgColorContent=%23fcfcfc&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=%23a6c9e2&fcContent=%23222222&iconColorContent=%23008fae&bgColorDefault=%2300bff3&bgTextureDefault=highlight_soft&bgImgOpacityDefault=45&borderColorDefault=%2300bff3&fcDefault=%23ffffff&iconColorDefault=%23e0fdff&bgColorHover=%2375e2ff&bgTextureHover=highlight_soft&bgImgOpacityHover=75&borderColorHover=%231496b3&fcHover=%230f6080&iconColorHover=%23116a8d&bgColorActive=%2336e935&bgTextureActive=highlight_soft&bgImgOpacityActive=50&borderColorActive=%230f7b0e&fcActive=%23ffffff&iconColorActive=%23f5e175&bgColorHighlight=%23fef1b9&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=%23fc9013&fcHighlight=%23000000&iconColorHighlight=%231296c4&bgColorError=%23f73640&bgTextureError=flat&bgImgOpacityError=45&borderColorError=%23700505&fcError=%23ffffff&iconColorError=%23fcd113&bgColorOverlay=%23a0a0a0&bgTextureOverlay=flat&bgImgOpacityOverlay=75&opacityOverlay=30&bgColorShadow=%23999999&bgTextureShadow=flat&bgImgOpacityShadow=55&opacityShadow=45&thicknessShadow=0px&offsetTopShadow=5px&offsetLeftShadow=5px&cornerRadiusShadow=5px
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=AftasansRegular%2CArial%2Csans-serif&fwDefault=normal&fsDefault=14px&cornerRadius=5px&bgColorHeader=%230a7694&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=%2300bff3&fcHeader=%23eaf5f7&iconColorHeader=%23d8e7f3&bgColorContent=%23fcfcfc&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=%23a6c9e2&fcContent=%23222222&iconColorContent=%23008fae&bgColorDefault=%2300bff3&bgTextureDefault=highlight_soft&bgImgOpacityDefault=45&borderColorDefault=%2300bff3&fcDefault=%23ffffff&iconColorDefault=%23e0fdff&bgColorHover=%2375e2ff&bgTextureHover=highlight_soft&bgImgOpacityHover=75&borderColorHover=%231496b3&fcHover=%230f6080&iconColorHover=%23116a8d&bgColorActive=%2336e935&bgTextureActive=highlight_soft&bgImgOpacityActive=50&borderColorActive=%230f7b0e&fcActive=%23ffffff&iconColorActive=%23f5e175&bgColorHighlight=%23fef1b9&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=%23fc9013&fcHighlight=%23000000&iconColorHighlight=%231296c4&bgColorError=%23f73640&bgTextureError=flat&bgImgOpacityError=45&borderColorError=%23700505&fcError=%23ffffff&iconColorError=%23fcd113&bgColorOverlay=%23a0a0a0&bgTextureOverlay=flat&bgImgOpacityOverlay=75&opacityOverlay=30&bgColorShadow=%23999999&bgTextureShadow=flat&bgImgOpacityShadow=55&opacityShadow=45&thicknessShadow=0px&offsetTopShadow=5px&offsetLeftShadow=5px&cornerRadiusShadow=5px
 * Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
 
 /* Layout helpers
@@ -784,7 +784,7 @@ body .ui-tooltip {
 /* Component containers
 ----------------------------------*/
 .ui-widget {
-	font-family: Candara,Arial,sans-serif;
+	font-family: "AftasansRegular",Arial,sans-serif;
 	font-size: 14px;
 }
 .ui-widget .ui-widget {
@@ -794,7 +794,7 @@ body .ui-tooltip {
 .ui-widget select,
 .ui-widget textarea,
 .ui-widget button {
-	font-family: Candara,Arial,sans-serif;
+	font-family: "AftasansRegular",Arial,sans-serif;
 	font-size: 1em;
 }
 .ui-widget-content {

app/controllers/actors_controller.rb

@@ -2,7 +2,7 @@ class ActorsController < ApplicationController
   # GET /actors
   # GET /actors.json
   def index
-    @actors = Actor.order(:lastname)
+    @actors = Actor.order(:lastname, :firstname)
 
     if params[:q]
       @actors.keep_if {|actor| actor.name =~ Regexp.new(Regexp.escape(params[:q]))}

app/controllers/movies_controller.rb

@@ -2,21 +2,6 @@ class MoviesController < ApplicationController
   # GET /movies
   # GET /movies.json
   def index
-#    if params[:sort]
-#      if params[:sort] == "alphabetical"
-#        @movies = Movie.order(:title)
-#      elsif params[:sort] == "date"
-#        @movies = Movie.order('lastWatched DESC')
-#      elsif params[:sort] == "type"
-#        @movies = Movie.order(:dvd)
-#      elsif params[:sort] == "duration"
-#        @movies = Movie.order(:duration)
-#      elsif params[:sort] == "year"
-#        @movies = Movie.order(:year)
-#      end
-#    else
-#      @movies = Movie.order(:title)
-#    end
     @filters = []
     params.each do |key, value|
       if key != "q" and key != "sort" and key != "action" and key != "controller" and value != ""
@@ -29,10 +14,10 @@ def index
     end
 
     @actors = []
-    Actor.all().each {|actor| @actors.push(actor.name)}
+    Actor.order(:lastname, :firstname).each {|actor| @actors.push(actor.name)}
 
     @genres = [""]
-    Genre.all().each {|genre| @genres.push(genre.name)}
+    Genre.order(:name).each {|genre| @genres.push(genre.name)}
 
     @movies = Movie.search(params[:q], params[:sort], @filters)
 

app/controllers/search_controller.rb

@@ -3,7 +3,7 @@ class SearchController < ApplicationController
   # GET /search.json
   def index
     @movies = Movie.order(:title)
-    @actors = Actor.order(:lastname)
+    @actors = Actor.order(:lastname, :firstname)
     @genres = Genre.order(:name)
 
     if params[:q]

app/helpers/movies_helper.rb

@@ -9,8 +9,6 @@ def setupURL(url)
       @url.gsub! "%20", " "
       @url.gsub! "+", " "
     end
-    puts @url
-    puts "<-----------------------------"
     @has_querystring = @url["?"] == "?"
   end
   def searchURL(category, value)
@@ -25,7 +23,6 @@ def cleanURL(url)
   def removeFilter(category, value)
     filter = Regexp.new "#{category}(\\[\\d?\\])?=#{value}"
     newurl = @url.sub filter, ""
-    puts newurl
     return cleanURL newurl
   end
   def addFilter(category, value, update=false)
@@ -52,8 +49,6 @@ def filterValue(category)
     if match
       match = match[:value]
     end
-    puts "match for #{category}"
-    puts match
     return match == "" ? "" : match
   end
 end

app/models/movie.rb

@@ -15,6 +15,14 @@ def yearstring
     end
   end
 
+  def display_name
+    r = Regexp.new(", ([Tt]he|[Aa]n|[Aa])$")
+    if title[r]
+      return r.match(title)[1] + " " + title.sub(r, "")
+    end
+    return title
+  end
+  
   def self.search(q, sort, filters)
     if sort == "alphabetical"
       movies = Movie.order(:title)
@@ -67,7 +75,6 @@ def self.search(q, sort, filters)
         nmovies.keep_if {|movie| times[value].include? movie.duration }
       end
     end
-    puts nmovies
     if q
       nmovies.keep_if {|movie| movie.title.downcase =~ Regexp.new(Regexp.escape(q.downcase))}
     end

app/views/actors/index.html.erb

@@ -8,7 +8,7 @@
 
 <form action="" method="GET" role="search" onsubmit="return q.value != ''">
 	<input id="searchbar" type="text" name="q" placeholder="Search..." <% if defined? @search %>value="<%= @search %>"<% end %> />
-	<button id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
+	<button title="Search" id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
 </form>
 <% @actors.each do |actor| %>
 		<article class="person">

app/views/actors/show.html.erb

@@ -16,7 +16,7 @@
     <% @actor.movies.sort! { |a,b| a.title.downcase <=> b.title.downcase } %>
 	<% @actor.movies.each do |movie| %>
 		<article class="<%= movie.dvd == 1 ? "dvd" : "video" %>">
-			<a href="<%= url_for movie %>"><h2><%= movie.title %> <%= movie.yearstring %></h2></a>
+			<a href="<%= url_for movie %>"><h2><%= movie.display_name %> <%= movie.yearstring %></h2></a>
 			<%= link_to 'Edit', edit_movie_path(movie), :class => "btn-edit ui-icon ui-icon-pencil", :title => 'Edit' %>
 			<%= link_to 'Delete', movie, method: :delete, data: { confirm: 'Are you sure?' }, :class => "btn-delete ui-icon ui-icon-closethick", :title => 'Delete' %>
 			<% if movie.lastWatched %>

app/views/genres/index.html.erb

@@ -8,7 +8,7 @@
 
 <form action="" method="GET" role="search" onsubmit="return q.value != ''">
 	<input id="searchbar" type="text" name="q" placeholder="Search..." <% if defined? @search %>value="<%= @search %>"<% end %> />
-	<button id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
+	<button title="Search" id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
 </form>
 
 <% @genres.each do |genre| %>

app/views/genres/show.html.erb

@@ -16,7 +16,7 @@
     <% @genre.movies.sort! { |a,b| a.title.downcase <=> b.title.downcase } %>
 	<% @genre.movies.each do |movie| %>
 		<article class="<%= movie.dvd == 1 ? "dvd" : "video" %>">
-			<a href="<%= url_for movie %>"><h2><%= movie.title %> <%= movie.yearstring %></h2></a>
+			<a href="<%= url_for movie %>"><h2><%= movie.display_name %> <%= movie.yearstring %></h2></a>
 			<%= link_to 'Edit', edit_movie_path(movie), :class => "btn-edit ui-icon ui-icon-pencil", :title => 'Edit' %>
 			<%= link_to 'Delete', movie, method: :delete, data: { confirm: 'Are you sure?' }, :class => "btn-delete ui-icon ui-icon-closethick", :title => 'Delete' %>
 			<% if movie.lastWatched %>

app/views/home/index.html.erb

@@ -1,8 +1,8 @@
 <h1>Search</h1>
 
-<form action="/search" method="GET" role="search" onsubmit="return q.value != ''">
+<form action="/movies" method="GET" role="search" onsubmit="return q.value != ''">
 	<input id="searchbar" type="text" name="q" placeholder="Search..." />
-	<button id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
+	<button title="Search" id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
 </form>
 
 <p class="info">Recent movies:

app/views/movies/index.html.erb

@@ -10,7 +10,8 @@
 <% setupURL request.original_fullpath[/\?.+$/] %>
 <form action="" method="GET" role="search">
 	<input id="searchbar" type="text" name="q" placeholder="Search..." <% if defined? @search %>value="<%= @search %>"<% end %> />
-	<button id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
+	<button title="Search" id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
+	<div class="ui-widget ui-helper-reset">
 	<div id="new-filters" class="ui-accordion-content ui-helper-reset ui-widget-content ui-corner-all ui-accordion-content-active" style="display: none">
 		<div class="field">
 			<%= label_tag 'Actor' %>
@@ -40,8 +41,17 @@
 			<%= label_tag 'DVD' %>
 			<%= select_tag 'dvd', options_for_select([["",""], ["DVD", 1], ["Video", 0]], filterValue("dvd")) %>
 		</div>
+		<div class="field">
+			<%= label_tag 'Sort' %>
+			<%= select_tag 'sort', options_for_select([["Date Watched","date"],["Alphabetical", "alphabetical"], ["Video/DVD", "dvd"], ["Duration", "duration"], ["Year", "year"]], filterValue('sort') || 'alphabetical') %>
+		</div>
+		<p class="info" style="text-align: center;">Click search for changes to take effect</p>
+	</div>
+	<h3 id="filters-toggle" class="ui-accordion-icons ui-accordion-header ui-state-default ui-corner-all ui-helper-reset">
+		<span class="ui-icon ui-icon-circle-plus">&nbsp;</span>
+		<span>Filters</span>
+	</h3>
 	</div>
-	<h3 id="filters-toggle" class="ui-accordion-header ui-state-default ui-corner-all ui-helper-reset">Filters</h3>
 	<div class="sort-options">
 		<p>Sort by: 
 		<%= link_to "Date Viewed", addFilter('sort', 'date', true), :class => "sort" %>
@@ -50,15 +60,6 @@
 		<%= link_to "Running Time", addFilter('sort', 'duration', true), :class => "sort" %>
 		<%= link_to "Year", addFilter('sort', 'year', true), :class => "sort" %></p>
 	</div>
-	<!--<% @filters.each do |filter| %>
-		<% if filter[:value].kind_of? Hash %>
-			<% filter[:value].each do |i,subvalue| %>
-				<%= hidden_field_tag "#{filter[:name]}[#{i}]", subvalue %>
-			<% end %>
-		<% else %>
-			<%= hidden_field_tag filter[:name], filter[:value] %>
-		<% end %>
-	<% end %>-->
 </form>
 <% @filters.each do |filter| %>
 	<% if filter[:value].kind_of? Hash %>
@@ -75,7 +76,7 @@
 <% end %>
 <% @movies.each do |movie| %>
 	<article class="<%= movie.dvd == 1 ? "dvd" : "video" %>">
-		<a href="<%= url_for movie %>"><h2><%= movie.title %> <%= movie.yearstring %></h2></a>
+		<a href="<%= url_for movie %>"><h2><%= movie.display_name %> <%= movie.yearstring %></h2></a>
 		<%= link_to 'Edit', edit_movie_path(movie), :class => "btn-edit ui-icon ui-icon-pencil", :title => 'Edit' %>
 		<%= link_to 'Delete', movie, method: :delete, data: { confirm: 'Are you sure?' }, :class => "btn-delete ui-icon ui-icon-closethick", :title => 'Delete' %>
 		<% if movie.lastWatched %>

app/views/movies/show.html.erb

@@ -16,7 +16,7 @@
 <% end %>
 
 <article class="<%= @movie.dvd == 1 ? "dvd" : "video"%>">
-	<h2><%= @movie.title %> <%= @movie.yearstring %></h2>
+	<h2><%= @movie.display_name %> <%= @movie.yearstring %></h2>
 	<% if @movie.lastWatched %>
 		<p>Last Watched: <span class="lastwatched"><%= @movie.lastWatched %></span></p>
 	<% end %>

app/views/search/index.html.erb

@@ -10,12 +10,12 @@
 
 <form action="" method="GET" role="search" onsubmit="return q.value != ''">
 	<input id="searchbar" type="text" name="q" placeholder="Search..." <% if defined? @search %>value="<%= @search %>"<% end %> />
-	<button id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
+	<button title="Search" id="searchbtn" type="submit" class="ui-button-icon-only"><span style="display: inline-block" class="ui-icon ui-icon-search"></span></button>
 </form>
 
 <% @movies.each do |movie| %>
 	<article class="<%= movie.dvd == 1 ? "dvd" : "video" %>">
-		<a href="<%= url_for movie %>"><h2><%= movie.title %> <%= movie.yearstring %></h2></a>
+		<a href="<%= url_for movie %>"><h2><%= movie.display_name %> <%= movie.yearstring %></h2></a>
 		<%= link_to 'Edit', edit_movie_path(movie), :class => "btn-edit ui-icon ui-icon-pencil", :title => 'Edit' %>
 		<%= link_to 'Delete', movie, method: :delete, data: { confirm: 'Are you sure?' }, :class => "btn-delete ui-icon ui-icon-closethick", :title => 'Delete' %>
 		<% if movie.lastWatched %>