[cc-commits] [CC SVN] r12607 - in cchost/trunk/ccskins/shared: . formats
webmaster at creativecommons.org
webmaster at creativecommons.org
Wed May 13 00:10:14 EDT 2009
Author: fourstones
Date: 2009-05-13 04:10:13 +0000 (Wed, 13 May 2009)
New Revision: 12607
Added:
cchost/trunk/ccskins/shared/upload_page_pieces.tpl
Modified:
cchost/trunk/ccskins/shared/formats/upload_page_narrow.php
cchost/trunk/ccskins/shared/formats/upload_page_shared.tpl
cchost/trunk/ccskins/shared/formats/upload_page_wide.php
cchost/trunk/ccskins/shared/skin.php
Log:
upload_page_wide is now a table layout (blame IE6-8)
Modified: cchost/trunk/ccskins/shared/formats/upload_page_narrow.php
===================================================================
--- cchost/trunk/ccskins/shared/formats/upload_page_narrow.php 2009-05-12 23:43:53 UTC (rev 12606)
+++ cchost/trunk/ccskins/shared/formats/upload_page_narrow.php 2009-05-13 04:10:13 UTC (rev 12607)
@@ -38,5 +38,10 @@
</style>
-<? $T->Call('formats/upload_page_shared.tpl') ?>
+<?
+ if( empty($A['records']) )
+ return 'ok';
+ $T->Call('upload_page_div_layout');
+?>
+
Modified: cchost/trunk/ccskins/shared/formats/upload_page_shared.tpl
===================================================================
--- cchost/trunk/ccskins/shared/formats/upload_page_shared.tpl 2009-05-12 23:43:53 UTC (rev 12606)
+++ cchost/trunk/ccskins/shared/formats/upload_page_shared.tpl 2009-05-13 04:10:13 UTC (rev 12607)
@@ -17,212 +17,10 @@
* $Id: upload_page_shared.php 8092 2007-11-19 06:59:29Z fourstones $
*
*/
+
+ // This file has been deprecated in favor
+ // of ccskins/shared/upload_page_pieces.tpl
?>
-<!-- template upload_page_shared -->
+<!-- template upload_page_shared (deprecated) -->
-%if_null(records)%
- %return%
-%end_if%
-<link rel="stylesheet" type="text/css" title="Default Style" href="%url('css/upload_page.css')%" />
-
-%map(#R,records/0)%
-%map(record,#R)%
-
-<script type="text/javascript">
-var ratings_enabled = '%(#R/ratings_enabled)%';
-</script>
-
-%if_not_null(flagging)%
- <a class="flag upload_flag" title="%text(str_flag_this_upload)%" href="%(home-url)%flag/upload/%(#R/upload_id)%"> </a>
-%end_if%
-<div id="date_box">
- %text(str_list_date)%: %(#R/upload_date)%<!-- -->
- %if_not_empty(#R/upload_last_edit)%
- <span id="modified_date">%text(str_list_lastmod)%: %(#R/upload_last_edit)% %if_not_null(#R/upload_extra/last_op)% (%text(#R/upload_extra/last_op)%) %end_if%</span>
- %end_if%
-</div>
-
-<div id="upload_wrapper">
- <div id="upload_middle">
- <div class="box">
- <img src="%(#R/user_avatar_url)%" style="float:right" />
- <table cellspacing="0" cellpadding="0" id="credit_info">
- %if_null(#R/collab_id)%
- <tr><th>%text(str_by)%</th><td><a class="cc_user_link" href="%(#R/artist_page_url)%">%(#R/user_real_name)%</a></td></tr>
- %else%
- <tr><th>%text(str_collab_project)%:</th><td><a href="%(home-url)%collab/%(#R/collab_id)%">%(#R/collab_name)%</a></td></tr>
- <tr><th>%text(str_collab_credit)%:</th><td>
- %loop(#R/collab_users,U)%
- <a href="%(home-url)%people/%(#U/user_name)%">%(#U/user_real_name)%</a> %(#U/collab_user_credit)% %if_not_last(#U)% <br /> %end_if%
- %end_loop%
- </td></tr>
- %end_if%
-
- %if_not_null(#R/upload_extra/featuring)%
- <tr><th>%text(str_featuring)%</th><td>%(#R/upload_extra/featuring)%</td></tr>
- %end_if%
-
- %if_not_null(#R/files/0/file_format_info/ps)%
- <tr><th>%text(str_list_length)%</th><td>%(#R/files/0/file_format_info/ps)%</td></tr>
- %end_if%
-
- %if_not_null(#R/upload_extra/bpm)%
- <tr><th>%text(str_bpm)%</th><td>%(#R/upload_extra/bpm)%</td></tr>
- %end_if%
-
-
- %if_not_null(#R/ratings_enabled)%
- %if_empty(#R/thumbs_up)%
- <tr><th id="rate_label_%(#R/upload_id)%">%if_not_null(#R/ratings)%<!-- -->%text(str_ratings)% %end_if%</th>
- <td><span id="rate_block_%(#R/upload_id)%">%call('util.tpl/ratings_stars_user')% </span></td></tr>
- %else%
- <tr><th>%text(str_recommends)%</th>
- <td>%call('util.php/recommends')%</td></tr>
- %end_if%
- %end_if%
-
- </table>
-
- %if_not_null(#R/upload_description_html)%
- <? $scroll = (strlen($R['upload_description_html']) > 400) || (preg_match_all('/<br/',$R['upload_description_html'],$brs) > 17); ?>
- %if_not_null(#scroll)%
- <div style="overflow:scroll;height:19em;border:1px solid #BBB;padding:4px;">
- %end_if%
- %(#R/upload_description_html)%
- %if_not_null(#scroll)%
- </div>
- %end_if%
- %end_if%
-
- <div class="taglinks">
- %loop(#R/upload_taglinks,tag)%
- <a href="%(#tag/tagurl)%">%(#tag/tag)%</a>%if_not_last(#tag)%, %end_if%
- %end_loop%
- </div>
-
- %if_not_empty(#R/fplay_url)%
- <div class="playerdiv"><span class="playerlabel">%text(str_play)%</span><a class="cc_player_button cc_player_hear" id="_ep_%(#R/upload_id)%"> </a></div>
- <script type="text/javascript"> $('_ep_%(#R/upload_id)%').href = '%(#R/fplay_url)%' </script>
- %end_if%
-
- <div class="info_box_clear"> </div>
- </div><!-- info box -->
-
- %if_not_null(#R/file_macros)%
- <div class="box">
- %loop(#R/file_macros,M)%
- %call(#M)%
- %end_loop%
- </div>
- %end_if%
-
- </div>
-
-</div><!-- upload_middle/wrapper -->
-
-<div id="upload_sidebar_box">
-
- <div class="box" id="license_info" %if_not_null(#R/files/0/file_extra/sha1)% about="urn:sha1:%(#R/files/0/file_extra/sha1)%" %end_if% >
- <p>
- <div id="license_info_t" >
- "<span property="dc:title">%(#R/upload_name)%</span>" <br />
- %text(str_by)% <span property="dc:creator"> %(#R/user_real_name)%</span><br /><br />
- %(#R/year)% - %text(str_lic)%<br />
- Creative Commons<br />
- <a rel="license" href="%(#R/license_url)%" title="%(#R/license_name)%">%(#R/license_name)%</a><br /><br />
- <a rel="license" href="%(#R/license_url)%" title="%(#R/license_name)%"><img title="%(#R/license_name)%" src="%(#R/license_logo_url)%" /></a>
- </div>
- </p>
- </div>
-
- %if_not_null(#R/edpick)%
- <div class="box" id="pick_box">
- <img src="%url('images/big-red-star.gif')%" />
- <h2>%text(str_edpick)%</h2>
- <p>%(#R/edpick/review)%</p>
- <div class="pick_reviewer">%(#R/edpick/reviewer)%</div>
- </div>
- %end_if%
-
- %if_not_null(#R/remix_parents)%
- <div class="box" id="remix_info">
- <img src="%url('images/downloadicon.gif')%" />
- <h2>%text(str_list_uses)%</h2>
- %if_not_null(#R/parents_overflow)%
- <div style="overflow: scroll;height:300px;">
- %end_if%
- %loop(#R/remix_parents,P)%
- <div><a class="remix_links cc_file_link" href="%(#P/file_page_url)%">%(#P/upload_name)%</a> %text(str_by)%
- <a href="%(#P/artist_page_url)%" class="cc_user_link user_name">%(#P/user_real_name)%</a></div>
- %end_loop%
- %if_not_null(#R/parents_overflow)%
- </div>
- %end_if%
- </div>
- %end_if%
-
- %if_not_null(#R/remix_children)%
- <div class="box" id="remix_info">
- <img src="%url('images/uploadicon.gif')%" />
- <h2>%text(str_list_usedby)%</h2>
- %if_not_null(#R/children_overflow)%
- <div style="overflow: scroll;height:300px;">
- %end_if%
- %loop(#R/remix_children,P)%
- <div>
- %if_not_null(#P/pool_item_extra/ttype)%
- <? $tstr = $T->String('str_trackback_type_' . $P['pool_item_extra']['ttype']) ?>
- <span class="pool_item_type">%(#tstr)%</span>:
- %end_if%
- <a class="remix_links cc_file_link" href="%(#P/file_page_url)%">%(#P/upload_name)%</a> <span>%text(str_by)%</span>
- <a class="cc_user_link" href="%(#P/artist_page_url)%">%(#P/user_real_name)%</a>
- </div>
- %end_loop%
- %if_not_null(#R/children_overflow)%
- </div>
- %end_if%
- </div>
- %end_if%
-
-</div><!-- sidebar box -->
-
-<div id="upload_menu_box">
-</div><!-- upload_menu_box -->
-<div style="clear:both"> </div>
-
-%call('flash_player')%
-<script type="text/javascript">
-if( window.ccEPlayer )
- ccEPlayer.hookElements($('upload_middle'));
-</script>
-%if_not_null(enable_playlists)%
- %if_not_null(logged_in_as)%
- %call('playlist.xml/playlist_menu')%
- %end_if%
-%end_if%
-
-<script type="text/javascript">
-function menu_cb(resp) {
- $('upload_menu_box').innerHTML = resp.responseText;
- var dl_hook = new queryPopup("download_hook","download",str_download);
- dl_hook.height = '550';
- dl_hook.width = '700';
- dl_hook.hookLinks();
- if( window.round_box_enabled )
- cc_round_boxes();
- if( user_name && ratings_enabled )
- {
- null_star = '%url('images/stars/star-empty.gif')%';
- full_star = '%url('images/stars/star-red.gif')%';
- rate_return_t = 'ratings_stars_user';
- recommend_return_t = 'recommends';
- new userHookup('upload_list', 'ids=%(#R/upload_id)%');
- %if_not_null(enable_playlists)%
- playlist_hook_menu();
- %end_if%
- }
-}
-var menu_url = query_url + 't=upload_menu&f=html&ids=%(#R/upload_id)%';
-new Ajax.Request( menu_url, { method: 'get', onComplete: menu_cb } );
-</script>
Modified: cchost/trunk/ccskins/shared/formats/upload_page_wide.php
===================================================================
--- cchost/trunk/ccskins/shared/formats/upload_page_wide.php 2009-05-12 23:43:53 UTC (rev 12606)
+++ cchost/trunk/ccskins/shared/formats/upload_page_wide.php 2009-05-13 04:10:13 UTC (rev 12607)
@@ -27,20 +27,14 @@
*/
?>
-<style type="text/css">
-div#upload_wrapper{float:left;width:100%}
-div#upload_middle{margin: 0 30% 0 20%;padding-left:2.0em;}
-div#upload_sidebar_box{float:left;width:30%;margin-left:-30%}
-div#upload_menu_box{float:left;width:20%;margin-left:-100%;padding-left:1.5em;}
-</style>
+<?
+ if( empty($A['records']) )
+ return 'ok';
-<!--[if IE]>
-<style type="text/css">
-div#upload_wrapper{float:left;width:100%;}
-div#upload_middle{margin: 0 35% 0 23%;}
-div#upload_sidebar_box{float:left;width:30%;margin-left:-30%;}
-div#upload_menu_box{float:left;width:23%;margin-left:-85%;}
-</style>
-<![endif]-->
-
-<? $T->Call('formats/upload_page_shared.tpl'); ?>
+ /*
+ * sorry but by the time IE8 rolled around
+ * any hope of doing the DIV version was
+ * completely killed.
+ */
+ $T->Call('upload_page_tbl_layout');
+?>
Modified: cchost/trunk/ccskins/shared/skin.php
===================================================================
--- cchost/trunk/ccskins/shared/skin.php 2009-05-12 23:43:53 UTC (rev 12606)
+++ cchost/trunk/ccskins/shared/skin.php 2009-05-13 04:10:13 UTC (rev 12607)
@@ -48,6 +48,13 @@
$A['tags'] = 'tags.php/tags';
+$A['upload_page_tbl_layout'] = 'upload_page_pieces.tpl/upload_page_tbl_layout';
+$A['upload_page_div_layout'] = 'upload_page_pieces.tpl/upload_page_div_layout';
+$A['upload_page_head'] = 'upload_page_pieces.tpl/upload_page_head';
+$A['upload_page_middle'] = 'upload_page_pieces.tpl/upload_page_middle';
+$A['upload_page_sidebar'] = 'upload_page_pieces.tpl/upload_page_sidebar';
+$A['upload_page_foot'] = 'upload_page_pieces.tpl/upload_page_foot';
+
$A['script_links'][] = 'js/selector-addon-v1.js';
//$A['script_links'][] = 'js/scriptaculous/scriptaculous.js';
Added: cchost/trunk/ccskins/shared/upload_page_pieces.tpl
===================================================================
--- cchost/trunk/ccskins/shared/upload_page_pieces.tpl (rev 0)
+++ cchost/trunk/ccskins/shared/upload_page_pieces.tpl 2009-05-13 04:10:13 UTC (rev 12607)
@@ -0,0 +1,243 @@
+<!-- template upload_page_pieces.tpl -->
+
+%macro(upload_page_tbl_layout)%
+ <style>
+ table#upload_page_table td {
+ vertical-align: top;
+ }
+ td#upload_menu_box {
+ width: 20%;
+ }
+ td#upload_sidebar_td {
+ width: 30%;
+ }
+ </style>
+ %call(upload_page_head)%
+ <table id="upload_page_table">
+ <tr>
+ <td id="upload_menu_box">
+ </td>
+ <td id="upload_middle_td">
+ %call(upload_page_middle)%
+ </td>
+ <td id="upload_sidebar_td">
+ %call(upload_page_sidebar)%
+ </td>
+ </tr>
+ </table>
+ %call(upload_page_foot)%
+%end_macro%
+
+%macro(upload_page_div_layout)%
+ %call(upload_page_head)%
+ <div id="upload_wrapper">
+ <div id="upload_middle">
+ %call(upload_page_middle)%
+ </div>
+ </div><!-- upload_middle/wrapper -->
+ <div id="upload_sidebar_box">
+ %call(upload_page_sidebar)%
+ </div><!-- sidebar box -->
+ <div id="upload_menu_box">
+ </div><!-- upload_menu_box -->
+ <div style="clear:both"> </div>
+ %call(upload_page_foot)%
+%end_macro%
+
+%macro(upload_page_head)%
+ <link rel="stylesheet" type="text/css" title="Default Style" href="%url('css/upload_page.css')%" />
+ %map(record,records/0)%
+ %map(#R,record)%
+ <script type="text/javascript">
+ var ratings_enabled = '%(#R/ratings_enabled)%';
+ </script>
+
+ %if_not_null(flagging)%
+ <a class="flag upload_flag" title="%text(str_flag_this_upload)%" href="%(home-url)%flag/upload/%(#R/upload_id)%"> </a>
+ %end_if%
+ <div id="date_box">
+ %text(str_list_date)%: %(#R/upload_date)%<!-- -->
+ %if_not_empty(#R/upload_last_edit)%
+ <span id="modified_date">%text(str_list_lastmod)%: %(#R/upload_last_edit)% %if_not_null(#R/upload_extra/last_op)% (%text(#R/upload_extra/last_op)%) %end_if%</span>
+ %end_if%
+ </div>
+%end_macro%
+
+%macro(upload_page_middle)%
+ %map(#R,record)%
+ <div class="box">
+ <img src="%(#R/user_avatar_url)%" style="float:right" />
+ <table cellspacing="0" cellpadding="0" id="credit_info">
+ %if_null(#R/collab_id)%
+ <tr><th>%text(str_by)%</th><td><a class="cc_user_link" href="%(#R/artist_page_url)%">%(#R/user_real_name)%</a></td></tr>
+ %else%
+ <tr><th>%text(str_collab_project)%:</th><td><a href="%(home-url)%collab/%(#R/collab_id)%">%(#R/collab_name)%</a></td></tr>
+ <tr><th>%text(str_collab_credit)%:</th><td>
+ %loop(#R/collab_users,U)%
+ <a href="%(home-url)%people/%(#U/user_name)%">%(#U/user_real_name)%</a> %(#U/collab_user_credit)% %if_not_last(#U)% <br /> %end_if%
+ %end_loop%
+ </td></tr>
+ %end_if%
+
+ %if_not_null(#R/upload_extra/featuring)%
+ <tr><th>%text(str_featuring)%</th><td>%(#R/upload_extra/featuring)%</td></tr>
+ %end_if%
+
+ %if_not_null(#R/files/0/file_format_info/ps)%
+ <tr><th>%text(str_list_length)%</th><td>%(#R/files/0/file_format_info/ps)%</td></tr>
+ %end_if%
+
+ %if_not_null(#R/upload_extra/bpm)%
+ <tr><th>%text(str_bpm)%</th><td>%(#R/upload_extra/bpm)%</td></tr>
+ %end_if%
+
+
+ %if_not_null(#R/ratings_enabled)%
+ %if_empty(#R/thumbs_up)%
+ <tr><th id="rate_label_%(#R/upload_id)%">%if_not_null(#R/ratings)%<!-- -->%text(str_ratings)% %end_if%</th>
+ <td><span id="rate_block_%(#R/upload_id)%">%call('util.tpl/ratings_stars_user')% </span></td></tr>
+ %else%
+ <tr><th>%text(str_recommends)%</th>
+ <td>%call('util.php/recommends')%</td></tr>
+ %end_if%
+ %end_if%
+
+ </table>
+
+ %if_not_null(#R/upload_description_html)%
+ <? $scroll = (strlen($R['upload_description_html']) > 400) || (preg_match_all('/<br/',$R['upload_description_html'],$brs) > 17); ?>
+ %if_not_null(#scroll)%
+ <div style="overflow:scroll;height:19em;border:1px solid #BBB;padding:4px;">
+ %end_if%
+ %(#R/upload_description_html)%
+ %if_not_null(#scroll)%
+ </div>
+ %end_if%
+ %end_if%
+
+ <div class="taglinks">
+ %loop(#R/upload_taglinks,tag)%
+ <a href="%(#tag/tagurl)%">%(#tag/tag)%</a>%if_not_last(#tag)%, %end_if%
+ %end_loop%
+ </div>
+
+ %if_not_empty(#R/fplay_url)%
+ <div class="playerdiv"><span class="playerlabel">%text(str_play)%</span><a class="cc_player_button cc_player_hear" id="_ep_%(#R/upload_id)%"> </a></div>
+ <script type="text/javascript"> $('_ep_%(#R/upload_id)%').href = '%(#R/fplay_url)%' </script>
+ %end_if%
+
+ <div class="info_box_clear"> </div>
+ </div><!-- info box -->
+
+ %if_not_null(#R/file_macros)%
+ <div class="box">
+ %loop(#R/file_macros,M)%
+ %call(#M)%
+ %end_loop%
+ </div>
+ %end_if%
+%end_macro%
+
+%macro(upload_page_sidebar)%
+ %map(#R,record)%
+ <div class="box" id="license_info" %if_not_null(#R/files/0/file_extra/sha1)% about="urn:sha1:%(#R/files/0/file_extra/sha1)%" %end_if% >
+ <p>
+ <div id="license_info_t" >
+ "<span property="dc:title">%(#R/upload_name)%</span>" <br />
+ %text(str_by)% <span property="dc:creator"> %(#R/user_real_name)%</span><br /><br />
+ %(#R/year)% - %text(str_lic)%<br />
+ Creative Commons<br />
+ <a rel="license" href="%(#R/license_url)%" title="%(#R/license_name)%">%(#R/license_name)%</a><br /><br />
+ <a rel="license" href="%(#R/license_url)%" title="%(#R/license_name)%"><img title="%(#R/license_name)%" src="%(#R/license_logo_url)%" /></a>
+ </div>
+ </p>
+ </div>
+
+ %if_not_null(#R/edpick)%
+ <div class="box" id="pick_box">
+ <img src="%url('images/big-red-star.gif')%" />
+ <h2>%text(str_edpick)%</h2>
+ <p>%(#R/edpick/review)%</p>
+ <div class="pick_reviewer">%(#R/edpick/reviewer)%</div>
+ </div>
+ %end_if%
+
+ %if_not_null(#R/remix_parents)%
+ <div class="box" id="remix_info">
+ <img src="%url('images/downloadicon.gif')%" />
+ <h2>%text(str_list_uses)%</h2>
+ %if_not_null(#R/parents_overflow)%
+ <div style="overflow: scroll;height:300px;">
+ %end_if%
+ %loop(#R/remix_parents,P)%
+ <div><a class="remix_links cc_file_link" href="%(#P/file_page_url)%">%(#P/upload_name)%</a> %text(str_by)%
+ <a href="%(#P/artist_page_url)%" class="cc_user_link user_name">%(#P/user_real_name)%</a></div>
+ %end_loop%
+ %if_not_null(#R/parents_overflow)%
+ </div>
+ %end_if%
+ </div>
+ %end_if%
+
+ %if_not_null(#R/remix_children)%
+ <div class="box" id="remix_info">
+ <img src="%url('images/uploadicon.gif')%" />
+ <h2>%text(str_list_usedby)%</h2>
+ %if_not_null(#R/children_overflow)%
+ <div style="overflow: scroll;height:300px;">
+ %end_if%
+ %loop(#R/remix_children,P)%
+ <div>
+ %if_not_null(#P/pool_item_extra/ttype)%
+ <? $tstr = $T->String('str_trackback_type_' . $P['pool_item_extra']['ttype']) ?>
+ <span class="pool_item_type">%(#tstr)%</span>:
+ %end_if%
+ <a class="remix_links cc_file_link" href="%(#P/file_page_url)%">%(#P/upload_name)%</a> <span>%text(str_by)%</span>
+ <a class="cc_user_link" href="%(#P/artist_page_url)%">%(#P/user_real_name)%</a>
+ </div>
+ %end_loop%
+ %if_not_null(#R/children_overflow)%
+ </div>
+ %end_if%
+ </div>
+ %end_if%
+%end_macro%
+
+%macro(upload_page_foot)%
+ %map(#R,record)%
+ %call('flash_player')%
+ <script type="text/javascript">
+ if( window.ccEPlayer )
+ ccEPlayer.hookElements($('upload_middle'));
+ </script>
+ %if_not_null(enable_playlists)%
+ %if_not_null(logged_in_as)%
+ %call('playlist.xml/playlist_menu')%
+ %end_if%
+ %end_if%
+
+ <script type="text/javascript">
+ function menu_cb(resp) {
+ $('upload_menu_box').innerHTML = resp.responseText;
+ var dl_hook = new queryPopup("download_hook","download",str_download);
+ dl_hook.height = '550';
+ dl_hook.width = '700';
+ dl_hook.hookLinks();
+ if( window.round_box_enabled )
+ cc_round_boxes();
+ if( user_name && ratings_enabled )
+ {
+ null_star = '%url('images/stars/star-empty.gif')%';
+ full_star = '%url('images/stars/star-red.gif')%';
+ rate_return_t = 'ratings_stars_user';
+ recommend_return_t = 'recommends';
+ new userHookup('upload_list', 'ids=%(#R/upload_id)%');
+ %if_not_null(enable_playlists)%
+ playlist_hook_menu();
+ %end_if%
+ }
+ }
+ var menu_url = query_url + 't=upload_menu&f=html&ids=%(#R/upload_id)%';
+ new Ajax.Request( menu_url, { method: 'get', onComplete: menu_cb } );
+ </script>
+%end_macro%
More information about the cc-commits
mailing list