[cc-commits] [CC SVN] r12640 - in cchost/trunk: ccadmin cchost_lib ccskins/shared ccskins/shared/css ccskins/shared/strings
webmaster at creativecommons.org
webmaster at creativecommons.org
Fri May 22 17:32:44 EDT 2009
Author: fourstones
Date: 2009-05-22 21:32:44 +0000 (Fri, 22 May 2009)
New Revision: 12640
Modified:
cchost/trunk/ccadmin/cc-install-settings.php
cchost/trunk/cchost_lib/cc-ratings-admin.inc
cchost/trunk/ccskins/shared/css/upload_page.css
cchost/trunk/ccskins/shared/strings/all_media.php
cchost/trunk/ccskins/shared/upload_page_pieces.tpl
Log:
officially added histogram stuff
previous checkin broke 'picks' page
Modified: cchost/trunk/ccadmin/cc-install-settings.php
===================================================================
--- cchost/trunk/ccadmin/cc-install-settings.php 2009-05-22 21:07:25 UTC (rev 12639)
+++ cchost/trunk/ccadmin/cc-install-settings.php 2009-05-22 21:32:44 UTC (rev 12640)
@@ -189,6 +189,7 @@
'ratings_ban' => '',
'requires-review' => '',
'thumbs_up' => 1,
+ 'cut-off' => '2 weeks ago',
'rank_formula' => '((upload_num_scores*4) + (upload_num_playlists*2))',
),
),
Modified: cchost/trunk/cchost_lib/cc-ratings-admin.inc
===================================================================
--- cchost/trunk/cchost_lib/cc-ratings-admin.inc 2009-05-22 21:07:25 UTC (rev 12639)
+++ cchost/trunk/cchost_lib/cc-ratings-admin.inc 2009-05-22 21:32:44 UTC (rev 12640)
@@ -62,6 +62,20 @@
'formatter' => 'checkbox',
'flags' => CCFF_POPULATE),
+ 'cut-off' =>
+ array( 'label' => _('Cut Off Point'),
+ 'form_tip' => _('Used by "picks" page to limit results.'),
+ 'formatter' => 'select',
+ 'options' => array( '1 day ago' => _('The day before'),
+ '3 days ago' => _('The previous 3 days'),
+ '1 week ago' => _('The previous week'),
+ '2 weeks ago' => _('The previous 2 weeks'),
+ '1 month ago' => _('The previous month'),
+ 'forever' => _('Since forever and ever'),
+ ),
+ 'value' => '2 weeks ago',
+ 'flags' => CCFF_POPULATE),
+
'rank_formula' =>
array( 'label' => _('Query Ranking formula'),
'form_tip' => _('This is the SQL used to calculate sort=rank for the Query API(WARNING: easy to break the site!)'),
Modified: cchost/trunk/ccskins/shared/css/upload_page.css
===================================================================
--- cchost/trunk/ccskins/shared/css/upload_page.css 2009-05-22 21:07:25 UTC (rev 12639)
+++ cchost/trunk/ccskins/shared/css/upload_page.css 2009-05-22 21:32:44 UTC (rev 12640)
@@ -133,3 +133,8 @@
float: right;
margin-right: 20px;
}
+
+#histogram_link {
+ text-align: center;
+ margin: 5px;
+}
Modified: cchost/trunk/ccskins/shared/strings/all_media.php
===================================================================
--- cchost/trunk/ccskins/shared/strings/all_media.php 2009-05-22 21:07:25 UTC (rev 12639)
+++ cchost/trunk/ccskins/shared/strings/all_media.php 2009-05-22 21:32:44 UTC (rev 12640)
@@ -277,12 +277,12 @@
$GLOBALS['str_hidi_date'] = _('Upload date');
$GLOBALS['str_hidi_author'] = _('Artist');
-$GLOBALS['str_invalid_tag'] = _('[Don\'t know variable: %s]');
$GLOBALS['str_hidden'] = _('Hidden');
$GLOBALS['str_hidden_list'] = _('Unpublished and Moderated Uploads');
$GLOBALS['str_highest_rated'] = _('Highest Rated');
$GLOBALS['str_info'] = _('Info');
+$GLOBALS['str_invalid_tag'] = _('[Don\'t know variable: %s]');
$GLOBALS['str_lang_default'] = _('Default Language');
$GLOBALS['str_list_length'] = _('length');
$GLOBALS['str_list_num_files'] = _('Number of files: %d');
@@ -563,6 +563,7 @@
$GLOBALS['str_recommends_s_2'] = _('%s recommends these uploads.');
$GLOBALS['str_remix'] = _('Remix');
+$GLOBALS['str_remix_history'] = _('Remix History Chart');
$GLOBALS['str_remix_i_used_samples'] = _('I used samples from');
$GLOBALS['str_remix_artist'] = _('Artist');
$GLOBALS['str_remix_editing'] = _("Editing Remix Sources for '%s'");
Modified: cchost/trunk/ccskins/shared/upload_page_pieces.tpl
===================================================================
--- cchost/trunk/ccskins/shared/upload_page_pieces.tpl 2009-05-22 21:07:25 UTC (rev 12639)
+++ cchost/trunk/ccskins/shared/upload_page_pieces.tpl 2009-05-22 21:32:44 UTC (rev 12640)
@@ -161,11 +161,6 @@
<?= $T->String(array('str_lic_click',"<a href=\"{$R['license_url']}\">","</a>")); ?>
</p>
</div>
- <div id="histogram">
- <p>
- <a href="%(query-url)%t=upload_histogram&ids=%(#R/upload_id)%">Histogram</a>
- </p>
- </div>
</p>
</div>
@@ -195,7 +190,12 @@
%if_not_null(#R/parents_overflow)%
</div>
%end_if%
+ <div id="histogram_link">
+ <p>
+ <a href="%(query-url)%t=upload_histogram&ids=%(#R/upload_id)%">%text(str_remix_history)%</a>
+ </p>
</div>
+ </div>
%end_if%
%if_not_null(#R/remix_children)%
More information about the cc-commits
mailing list