[cc-commits] [CC SVN] r14214 - in cchost/trunk/dig: css js lib pages

webmaster at creativecommons.org webmaster at creativecommons.org
Fri Mar 5 17:59:56 EST 2010


Author: fourstones
Date: 2010-03-05 22:59:56 +0000 (Fri, 05 Mar 2010)
New Revision: 14214

Modified:
   cchost/trunk/dig/css/site.css
   cchost/trunk/dig/js/ccmd.js
   cchost/trunk/dig/lib/query.php
   cchost/trunk/dig/pages/dig.php
Log:
re-arch snapshot (going for a swim)

Modified: cchost/trunk/dig/css/site.css
===================================================================
--- cchost/trunk/dig/css/site.css	2010-03-05 18:50:50 UTC (rev 14213)
+++ cchost/trunk/dig/css/site.css	2010-03-05 22:59:56 UTC (rev 14214)
@@ -298,7 +298,7 @@
 p.site-license {
 	margin-top: 2em;
 	padding-bottom: 1em;
-	vertical-align: center;
+	vertical-align: middle; /* was 'center' */
 }
 .site-license img {
 	vertical-align: text-bottom;
@@ -311,10 +311,14 @@
 .search-utility {
 	background-color: #FFF;
 }
-.search-utility, .advanced-search-utility {
+.search-utility {
 	margin: 0 0 .5em 0;
 }
 .advanced-search-utility {
+	margin: 0 0 .5em 0;
+}
+
+.advanced-search-utility {
 	display: none;
 }
 .search-input-container {
@@ -399,6 +403,7 @@
 }
 #advanced-search-query {
 	width: 892px;
+    display: none;
 
 }
 #advanced-search-results {

Modified: cchost/trunk/dig/js/ccmd.js
===================================================================
--- cchost/trunk/dig/js/ccmd.js	2010-03-05 18:50:50 UTC (rev 14213)
+++ cchost/trunk/dig/js/ccmd.js	2010-03-05 22:59:56 UTC (rev 14214)
@@ -20,7 +20,12 @@
     nvzion.com, 2010
 */
 
+
 /*
+    N.B. Several of the results handlers are referred to from server code
+*/
+
+/*
     YAHOO! MEDIA PLAYER CONFIGURATION
 */
 var YMPParams = {
@@ -51,6 +56,7 @@
 var str_podcasts = 'Podcasts';
 
 var original_search_type = null;
+var adv_showing = false;
 
 /*
     ADVANCED UTILITY
@@ -153,6 +159,11 @@
 }
 
 function populate_tags() {
+    
+    if( window.tags_populated )
+        return;
+    window.tags_populated = true;
+    
     $('#clear').click( function(e) { onClearTag(); });
     $('#tag_add').click(function(e) { onAddTagToQuery(); });
     // populate the tag categories
@@ -193,6 +204,7 @@
         cat: 'mood'   // 'Style' actually
     };
     new ccmQuery(options, parameters, tagStyleQueryResults).query();
+    
 }
 
 function _tagQueryResults(results,type,results_div) {
@@ -1021,8 +1033,6 @@
     return '<div id="loading"><img src="images/loading.gif"></div>';
 }
 
-var default_digging_for = '<h3 id="diggingfor">You went digging for: All types of music</h3>';
-
 /*
     SEARCH & POPULATE
 */
@@ -1040,7 +1050,7 @@
     }
 
     var q = '?';
-    url = DIG_ROOT_URL + '/' + search_type;
+    url = DIG_ROOT_URL + '/' + page;
     
     if( search_lic == 'open' )
     {
@@ -1057,275 +1067,113 @@
     if( search_type != 'dig' )
     {
         url += q + 'search-type=' + search_type;
+        q = '&';
     }
 
+    if( adv_showing )
+    {
+        var val;
+        
+        url += q +  'advanced-search-results=' + $('#advanced-search-results').val()
+                 + '&advanced-search-sortby='  + $('#advanced-search-sortby').val()
+                 + '&advanced-search-sortdir=' + $('#advanced-search-sortdir').val()
+                 + '&advanced-search-stype='   + $('#advanced-search-stype').val()
+                 + '&adv=1';
+                 
+        val = $('#advanced-search-since').val();
+        
+        if( val.length > 0 )
+        {
+            url += '&advanced-search-since=' + val;            
+        }
+        
+        val = $('#advanced-search-tags').val();
+        
+        if( val.length > 0 )
+        {
+            url += '&advanced-search-tags=' + val;            
+        }
+    }
+
     document.location = url;
     return false; 
 }
 
-
-
-
-function do_advanced_search() {
-    var today = new Date();
-    var search_before = prep_date(today);
-    
-    var form_id = "advanced-search-utility";
-    var form = $('#'+form_id);
-    var search_val = $('#advanced-search-query').val();
-    var search_lic = $('#advanced-search-license').val();
-    var search_results = $('#advanced-search-results').val();
-    var search_since = $('#advanced-search-since').val();
-    var search_sort = $('#advanced-search-sortby').val();
-    var search_order = $('#advanced-search-sortdir').val();
-    var search_tags = $('#advanced-search-tags').val();
-    
-    var since_date = new Date();
-    var search_sinced = '';
-    
-    switch(search_since) {
-        case '*':
-            search_before = '';
-            break;
-        case '1 days ago':
-            since_date.setDate(since_date.getDate()-1);
-            search_sinced = prep_date(since_date);
-            break;
-        case '1 weeks ago':
-            since_date.setDate(since_date.getDate()-7);
-            search_sinced = prep_date(since_date);
-            break;
-        case '2 weeks ago':
-            since_date.setDate(since_date.getDate()-14);
-            search_sinced = prep_date(since_date);
-            break;
-        case '1 months ago':
-            since_date.setDate(since_date.getDate()-30);
-            search_sinced = prep_date(since_date);
-            break;
-        case '3 months ago':
-            since_date.setDate(since_date.getDate()-90);
-            search_sinced = prep_date(since_date);
-            break;
-        case '1 years ago':
-            since_date.setDate(since_date.getDate()-365);
-            search_sinced = prep_date(since_date);
-            break;
-    }
-    
-    $('#loading').show();
-    
-    var options = {
-        // debug: true,
-        paging: true,
-        parent: '#'+form_id
-    };
-    var parameters = {
-        dataview: 'diginfo',
-        sinced: search_sinced,
-        befored: search_before,
-        search: search_val,
-        ord: search_order,
-        sort: search_sort,
-        lic: search_lic,
-        offset: 0,
-        reqtags: search_tags,
-        type: 'any',
-        tagexp: '(remix|original)',
-        limit: search_results
-    };
-
-    $('#results').html('<div id="loading"><img src="images/loading.gif"></div>');
-    
-    queryObj = new ccmQuery(options, parameters, query_results);
-    queryObj.query();
-    
-    
-    var options2 = {
-        // debug: true,
-        paging: false,
-        parent: '#'+form_id
-    };
-    var parameters2 = {
-        dataview: 'tag_alias',
-        search: search_val+','+search_tags
-    };
-    
-    $('#didumean').html('');
-    
-    var didUMeanQuery = new ccmQuery(options2, parameters2, advanced_didUMean_results);
-    didUMeanQuery.query();
-    
+function handle_home_submit()
+{
+    var val = $('#q').val();
+    var url = DIG_ROOT_URL + '/dig?search-query=' + val;
+    document.location = url;
     return false;
 }
 
-function populate_featured() {
-    // populate edpicks
-    
-    var options = {
-        //debug: true,
-        parent: '#results'
-    }
-    var parameters = {
-        dataview: 'diginfo',
-        tags: 'editorial_pick',
-        limit: 6
-        
-    };
-    new ccmQuery(options, parameters, edpickQueryResults).query();
-    
-    var parameters = {
-        dataview: 'diginfo',
-        tags: 'remix',
-        sort: 'rank',
-        sinced: '2 weeks ago',
-        limit: 6
-        
-    };
-    new ccmQuery(options, parameters, popchartQueryResults).query();
-
-    var parameters = {
-        dataview: 'topics_podinfo',
-        type: 'podcast',
-        limit: 10,
-        offset: 1
-    };
-    new ccmQuery(options, parameters, podcastQueryResults).query();
+function populate_home()
+{
+    $('#entry-search').click( handle_home_submit );
+    $('#entry-search-form').submit( handle_home_submit );
 }
 
-function populate_picks() {
-    var options = {
-        // debug: true,
-        paging: true,
-        parent: '#results'
-    }
-    var parameters = {
-        dataview: 'diginfo',
-        tags: 'editorial_pick',
-        limit: 10,
-        offset: 0
-    };
-    $('#results').html(progress_indicator());
-
-    queryObj = new ccmQuery(options, parameters, query_results);
-    queryObj.query();
+function show_advanced(e)
+{
+    var basic_search_link = jQuery('.basic-search-link');
+    var advanced_search_link = jQuery('.advanced-search-link');
+    
+    window.old_s_height = $('.search-utility').height(); 
+    $('.search-utility').height('42px');
+    $('.advanced-search-utility').show();
+    basic_search_link.show();
+    advanced_search_link.hide();
+    populate_tags();
+    return false;    
 }
 
-/*
-function populate_popular() {
-    var options = {
-        // debug: true,
-        paging: true,
-        parent: '#results'
-    }
-
-    var parameters = {
-        dataview: 'diginfo',
-        tags: 'remix',
-        sort: 'rank',
-        sinced: '2 weeks ago',
-        limit: 10,
-        offset: 0
-    };
-
-    queryObj = new ccmQuery(options, parameters, query_results);
-    queryObj.query();
-}
-
-function populate_podcasts() {
-    var options = {
-        debug: true,
-        paging: true,
-        parent: '#results'
-    }
-
-    var parameters = {
-        dataview: 'topics_podinfo',
-        datasource: 'topics',
-        type: 'podcast',
-        limit: 10,
-        offset: 1
-    };
-    $('#results').html(progress_indicator());
-
-    queryObj = new ccmQuery(options, parameters, podcastPageQueryResults);
-    queryObj.query();
-}
-*/
-
-function populate_home()
+function hide_advanced(e)
 {
-    $('#entry-search').click( function(e) {
-        $('#entry-search-form').submit();
-    });
+    var basic_search_link = jQuery('.basic-search-link');
+    var advanced_search_link = jQuery('.advanced-search-link');
+    
+    $('.search-utility').height(window.old_s_height);
+    $('.advanced-search-utility').hide();
+    advanced_search_link.show();
+    basic_search_link.hide();
+    return false;    
 }
 
 function populate_dig()
 {
-    var license = jQuery('.license');
-    var advanced_search_link = jQuery('.advanced-search-link');
-    var basic_search_link = jQuery('.basic-search-link');
-    var advanced_search_button = jQuery('#advanced-search');
+    //var advanced_search_button = jQuery('#advanced-search');
+    //advanced_search_button.click(do_advanced_search);
+    
     var search_button = jQuery('#search');
+    var basic_search_link = jQuery('.basic-search-link');
+    var advanced_search_link = jQuery('.advanced-search-link');
     
-    clean_advanced();
+    window.old_s_height = $('.search-utility').height(); 
     
+    if( adv_showing )
+        show_advanced();
+    else
+        clean_advanced();
+    
     /*
         click action attached to "Advanced dig" link to hide the basic dig form,
         show the advanced dig form and populate tags
     */
-    advanced_search_link.click(function(e) {
-        $('.search-utility').hide();
-        $('.advanced-search-utility').show();
-        $('#results').html('');
-        $('#didumean').html('');
-        basic_search_link.show();
-        $(this).hide();
-        populate_tags();
-        return false;
-    });
+    advanced_search_link.click( show_advanced );
     
     /*  
         click action attached to "Basic dig" link to hide the advanced dig form, 
         show the basic dig form and clear tags
     */
-    basic_search_link.click(function(e) {
-        $('.search-utility').show();
-        $('#results').html('');
-        $('#didumean').html('');
-        clean_advanced();
-        $('.advanced-search-utility').hide();
-        advanced_search_link.show();
-        $(this).hide();
-        return false;
-    });
-    
-    advanced_search_button.click(do_advanced_search);
-    
+    basic_search_link.click( hide_advanced );
+        
     search_button.click(do_search);
 
     window.original_search_type = $('#search-type').val();
     
 }
-/*
-    UTILITY
-*/
-function prep_date(date_object) {
-    var date = normalize_date_segment(date_object.getDate());
-    var month = normalize_date_segment(date_object.getMonth()+1);
-    var year = date_object.getFullYear();
-    
-    return month+'/'+date+'/'+year;
-}
 
-function normalize_date_segment(segment) {
-    if(segment < 10) {
-        segment = '0'+segment;
-    }
-    return segment;
-}
 
-
 jQuery(document).ready(function() {
     // if the home page
     if(jQuery('#homepage').length > 0) {
@@ -1337,28 +1185,5 @@
     if(jQuery('#dig').length > 0) {
         populate_dig();
     }
-
-/* 
-   
-    // if the featured page
-    if(jQuery('#featured').length > 0) {
-        populate_featured();
-    }
-
-    // if the picks page
-    if(jQuery('#pickspage').length > 0) {
-        populate_picks();
-    }
     
-    // if the popular page
-    if(jQuery('#popularpage').length > 0) {
-        populate_popular();
-    }
-    
-    // if the podcasts page
-    if(jQuery('#podcastspage').length > 0) {
-        populate_podcasts();
-    }   
-*/  
-    
 });
\ No newline at end of file

Modified: cchost/trunk/dig/lib/query.php
===================================================================
--- cchost/trunk/dig/lib/query.php	2010-03-05 18:50:50 UTC (rev 14213)
+++ cchost/trunk/dig/lib/query.php	2010-03-05 22:59:56 UTC (rev 14214)
@@ -181,7 +181,7 @@
         
         // separate out dig control fields
         
-        foreach( array('page') as $K )
+        foreach( array('page,dquery') as $K )
         {
             if( !empty($all[$K]) )
             {
@@ -190,7 +190,7 @@
         
         }
         
-        foreach( array('results_func') as $K )
+        foreach( array('results_func,adv') as $K )
         {
             if( !empty($all[$K]) )
             {

Modified: cchost/trunk/dig/pages/dig.php
===================================================================
--- cchost/trunk/dig/pages/dig.php	2010-03-05 18:50:50 UTC (rev 14213)
+++ cchost/trunk/dig/pages/dig.php	2010-03-05 22:59:56 UTC (rev 14214)
@@ -55,6 +55,10 @@
     dbg($queries);
 }
 $script_heads[] = queries_to_jscript( $queries );
+if( !empty($digQuery->pretty_args->args['adv']) )
+{
+    $script_heads[] = '<script type="text/javascript"> adv_showing = true; </script>' . "\n";
+}
 $page_title = empty($digQuery->_query_args['title']) ? 'dig.ccmixter' : $digQuery->_query_args['title'];
 $dig_class = 'class="current"';
             
@@ -104,7 +108,7 @@
 						</select>
 						<label for="advanced-search-since" id="advanced-search-since-label">since</label>
 						<select id="advanced-search-since" name="advanced-search-since">
-							<option value="*">Forever</option>
+							<option value="">Forever</option>
 							<option value="1 days ago">Yesterday</option>
 							<option value="1 weeks ago">1 week ago</option>
 							<option value="2 weeks ago">2 weeks ago</option>
@@ -114,20 +118,27 @@
 						</select>
 						<label for="advanced-search-sortby" id="advanced-search-sortby-label">sort</label>
 						<select name="advanced-search-sortby" id="advanced-search-sortby">
-							<option value="popularity">Popularity</option>
+							<option value="rank">Popularity</option>
 							<option value="date">Date</option>
-							<option value="track-name">Track name</option>
-							<option value="musician">Musician</option>
+							<option value="name">Track name</option>
+							<option value="user">Musician</option>
 						</select>
 						<select name="advanced-search-sortdir" id="advanced-search-sortdir">
 							<option value="desc">Descending</option>
 							<option value="asc">Ascending</option>
 						</select>
 						
-						<label for="advanced-search-license" id="advanced-search-license-label">license</label>
-						<select name="advanced-search-license" id="advanced-search-license" size="1">
+						<!-- label for="advanced-search-license" id="advanced-search-license-label">license</label>
+						<select style="display:none" name="advanced-search-license" id="advanced-search-license" size="1">
 							<option value="">All licenses</option>
 					        <option value="open">Free for commercial use</option>
+						</select -->
+                        
+						<label for="advanced-search-stype" id="advanced-search-stype-label">combine</label>
+						<select name="advanced-search-stype" id="advanced-search-stype" size="1">
+							<option value="all">All words</option>
+							<option value="any">Any word</option>
+							<option value="match">Exact phrase</option>
 						</select>
 						<input type="hidden" name="advanced-search-tags" value="" id="advanced-search-tags" />
 					</div>
@@ -146,18 +157,18 @@
 						</div>
 						<div class="clearer"></div>
 					</div>
-					<div class="advanced-search-row">
+					<div class="advanced-search-row  advanced-search-row-last">
 						<label id="tags-label">tags</label>
 						<div id="tags-container"></div>
 						<div class="clear-button-container"><a href="#" id="clear">Clear</a></div>
 						<div class="clearer"></div>
 					</div>
-					<div class="advanced-search-row advanced-search-row-last">
+					<!-- div class="advanced-search-row advanced-search-row-last">
 						<div class="advanced-search-button-container">
 							<input id="advanced-search" type="image" alt="Search" src="images/advanced-search-button-bg.png" />
 						</div>
 						<div class="clearer"></div>
-					</div>
+					</div -->
 					</form>
 			</div>
 			<div class="advanced"><a href="#" class="advanced-search-link">Advanced dig</a><a href="#" class="basic-search-link">Basic dig</a></div>




More information about the cc-commits mailing list