From 0fbeda90479df56924c6693d766bc9252a3b6a3b Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Thu, 26 May 2011 19:08:50 -0400
Subject: UI fix for toggling artwork

---
 templates/browse_filters.inc.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php
index 2d3076eb..38632778 100644
--- a/templates/browse_filters.inc.php
+++ b/templates/browse_filters.inc.php
@@ -51,11 +51,6 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
 	<input id="unplayedCB" type="checkbox" <?php echo $string = $browse->get_filter('unplayed') ? 'checked="checked"' : ''; ?>/>
 	<label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br />
 <?php } ?>
-<?php if (in_array('show_art',$allowed_filters)) { ?>
-	<input id="show_artCB" type="checkbox" <?php echo $string = $browse->get_filter('show_art') ? 'checked="checked"' : ''; ?>/>
-	<label id="show_artLabel" for="show_artCB"><?php echo _('Show Art'); ?></label><br />
-	<?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, '')); ?>
-<?php } // if show_art ?>
 <?php if (in_array('playlist_type',$allowed_filters)) { ?>
 	<input id="show_allplCB" type="checkbox" <?php echo $string = $browse->get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/>
 	<label id="show_allplLabel" for="showallplCB"><?php echo _('All Playlists'); ?></label><br />
@@ -99,5 +94,9 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
 <?php echo Ajax::observe('catalog_select','click',Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id,'catalog_select','catalog_choice'),'1'); ?>
 </form>
 <?php } ?>
+<?php if (in_array('show_art',$allowed_filters)) { ?>
+	<input id="show_artCB" class="button" type="submit" value="<?php echo _('Toggle Artwork'); ?>" <?php echo $string = $browse->get_filter('show_art') ? 'selected="selected"' : ''; ?>/>
+	<?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, '')); ?>
+<?php } // if show_art ?>
 </div>
 </li>
-- 
cgit 


From c1bcad2abca3af0905cef38f1d5dad308159d234 Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Thu, 26 May 2011 19:25:55 -0400
Subject: Partial fix for catalog filtering

Acting on 'click' sends the AJAX request as soon as the user clicks to
make the dropdown drop down; watch for 'change' instead.
---
 templates/browse_filters.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php
index 38632778..a366e0d7 100644
--- a/templates/browse_filters.inc.php
+++ b/templates/browse_filters.inc.php
@@ -91,7 +91,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
 		?>
 				
 	</select>
-<?php echo Ajax::observe('catalog_select','click',Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id,'catalog_select','catalog_choice'),'1'); ?>
+<?php echo Ajax::observe('catalog_select', 'change', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id,'catalog_select', 'catalog_choice'), true); ?>
 </form>
 <?php } ?>
 <?php if (in_array('show_art',$allowed_filters)) { ?>
-- 
cgit 


From 05c29e70e11a6736dda19748af242c55b3747c11 Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Sat, 28 May 2011 21:32:32 -0400
Subject: Add some additional CSS classes for search

---
 templates/show_rules.inc.php  | 2 +-
 templates/show_search.inc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php
index 1f98e0ae..e6db04cb 100644
--- a/templates/show_rules.inc.php
+++ b/templates/show_rules.inc.php
@@ -24,7 +24,7 @@
 <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search.js"></script>
 <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search-data.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"></script>
 
-<?php show_box_top(_('Rules') . "..."); ?>
+<?php show_box_top(_('Rules') . "...", 'box box_rules'); ?>
 <table class="tabledata" cellpadding="3" cellspacing="0">
 <tbody id="searchtable">
 	<tr>
diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php
index d7643cdf..d9c7fcb5 100644
--- a/templates/show_search.inc.php
+++ b/templates/show_search.inc.php
@@ -31,7 +31,7 @@
  * This is the template for the searches... amazing!
  */
 ?>
-<?php show_box_top(_('Search Ampache') . "..."); ?>
+<?php show_box_top(_('Search Ampache') . "...", 'box box_advanced_search'); ?>
 <form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline">
 <table class="tabledata" cellpadding="3" cellspacing="0">
 	<tr>
-- 
cgit 


From cd528e99499bcd4bc26074192bef8f2fb93a29e0 Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Fri, 24 Jun 2011 11:58:05 -0400
Subject: Add some spaces to make the verify output prettier

---
 templates/show_verify_catalog.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
index 2b09adde..7b799797 100644
--- a/templates/show_verify_catalog.inc.php
+++ b/templates/show_verify_catalog.inc.php
@@ -32,7 +32,7 @@ printf(_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>");
 echo "<br />\n";
 printf(ngettext('%d item found checking tag information', '%d items found checking tag information', $number), $number);
 echo "<br />\n\n";
-echo _('Verified') . ':<span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />';
-echo _('Reading') . ':<span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />';
+echo _('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />';
+echo _('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />';
 show_box_bottom();
 ?>
-- 
cgit