From a0daf83960fdf15efd3d89b12b36d32aaef7cc78 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 26 Jul 2012 10:17:11 +0000 Subject: [PATCH] =?UTF-8?q?Tarea=20#928=20->=20Habilitar=20dedicatorias=20?= =?UTF-8?q?con=20videos=20Vimeo=20Tarea=20#929=20->=20Revisar=20t=C3=ADtul?= =?UTF-8?q?os=20muy=20largos=20para=20poner=20"..."=20Tarea=20#930=20->=20?= =?UTF-8?q?Poner=20"FROM"=20y=20"TO"=20en=20todas=20las=20dedicatorias=20e?= =?UTF-8?q?xcepto=20cuando=20salgan=20en=20el=20perfil=20del=20usuario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@35 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6 --- .../score/dedications/single/dedicated-2-me.php | 2 +- .../single/home-column-dedicated-2-me.php | 2 +- .../single/home-column-my-dedications.php | 2 +- .../score/dedications/single/my-dedications.php | 2 +- .../score/dedications/single/new-dedication.php | 8 +++++++- wp-content/themes/score/functions.php | 2 -- wp-content/themes/score/header.php | 8 ++++---- wp-content/themes/score/index.php | 9 ++++----- .../themes/score/lib/admin/inc/theme-widgets.php | 6 +++--- wp-content/themes/score/lib/images/vimeo.png | Bin 0 -> 1715 bytes wp-content/themes/score/lib/images/youtube.png | Bin 0 -> 2250 bytes wp-content/themes/score/loop-dedication-data.php | 11 +++++++++-- wp-content/themes/score/members/members-loop.php | 2 +- .../score/members/single/small-member-header.php | 2 +- wp-content/themes/score/post-loop-dedication.php | 4 ++++ wp-content/themes/score/video-slider.php | 12 +++++++----- 16 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 wp-content/themes/score/lib/images/vimeo.png create mode 100644 wp-content/themes/score/lib/images/youtube.png diff --git a/wp-content/themes/score/dedications/single/dedicated-2-me.php b/wp-content/themes/score/dedications/single/dedicated-2-me.php index 3979f43..14ddae0 100644 --- a/wp-content/themes/score/dedications/single/dedicated-2-me.php +++ b/wp-content/themes/score/dedications/single/dedicated-2-me.php @@ -32,7 +32,7 @@ $dedications = bp_dedication_get_dedications_to_user( $bp->displayed_user->id );
-

. 

+

TO:
diff --git a/wp-content/themes/score/dedications/single/home-column-dedicated-2-me.php b/wp-content/themes/score/dedications/single/home-column-dedicated-2-me.php index 69ae598..245c4d6 100644 --- a/wp-content/themes/score/dedications/single/home-column-dedicated-2-me.php +++ b/wp-content/themes/score/dedications/single/home-column-dedicated-2-me.php @@ -40,7 +40,7 @@ $dedication_link = bp_core_get_userlink($bp->displayed_user->id, false, true) .
-

. 

+

FROM:
diff --git a/wp-content/themes/score/dedications/single/home-column-my-dedications.php b/wp-content/themes/score/dedications/single/home-column-my-dedications.php index 7deab40..3df5ea2 100644 --- a/wp-content/themes/score/dedications/single/home-column-my-dedications.php +++ b/wp-content/themes/score/dedications/single/home-column-my-dedications.php @@ -38,7 +38,7 @@ $dedication_link = bp_core_get_userlink($bp->displayed_user->id, false, true) .
-

. 

+

TO:
diff --git a/wp-content/themes/score/dedications/single/my-dedications.php b/wp-content/themes/score/dedications/single/my-dedications.php index 208ca80..56cfab7 100644 --- a/wp-content/themes/score/dedications/single/my-dedications.php +++ b/wp-content/themes/score/dedications/single/my-dedications.php @@ -33,7 +33,7 @@ $dedications = bp_dedication_get_dedications_from_user($bp->displayed_user->id);
-

. 

+

TO:
diff --git a/wp-content/themes/score/dedications/single/new-dedication.php b/wp-content/themes/score/dedications/single/new-dedication.php index 55f4b6e..b1d9489 100644 --- a/wp-content/themes/score/dedications/single/new-dedication.php +++ b/wp-content/themes/score/dedications/single/new-dedication.php @@ -63,7 +63,13 @@ global $bp; This dedication is private.
  • - + +
    diff --git a/wp-content/themes/score/functions.php b/wp-content/themes/score/functions.php index 28e428f..8503a33 100644 --- a/wp-content/themes/score/functions.php +++ b/wp-content/themes/score/functions.php @@ -603,6 +603,4 @@ function cutstr($str, $length, $ellipsis=''){ return $cut[0].((strlen($cut) \ No newline at end of file diff --git a/wp-content/themes/score/header.php b/wp-content/themes/score/header.php index b5b3f06..60772ab 100644 --- a/wp-content/themes/score/header.php +++ b/wp-content/themes/score/header.php @@ -58,10 +58,10 @@ $category_id = get_cat_ID( 'concerts' ); $category_link = get_category_link( $category_id ); ?> -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • diff --git a/wp-content/themes/score/index.php b/wp-content/themes/score/index.php index ae02295..f4c411c 100644 --- a/wp-content/themes/score/index.php +++ b/wp-content/themes/score/index.php @@ -7,7 +7,7 @@ $_ishome = (is_home() OR is_front_page()); ID != $from_user_id) && ($current_user->ID != $to_user_id)) { continue; // me salto esta dedicatoria } - } - $contador += 1; + } $video = get_post_meta($post->ID, 'ghostpool_dedication_url', true); if ($_ishome) { @@ -45,7 +44,7 @@ $urls_video = array(); } } $urls_video[] = $video; - + $contador += 1; ?> @@ -73,7 +72,7 @@ $urls_video = array();

    . 

    ID, 24); ?> - TO: ID); ?> + TO: ID); ?> TO: user_nicename; ?> diff --git a/wp-content/themes/score/lib/admin/inc/theme-widgets.php b/wp-content/themes/score/lib/admin/inc/theme-widgets.php index b92fb91..3f09d36 100644 --- a/wp-content/themes/score/lib/admin/inc/theme-widgets.php +++ b/wp-content/themes/score/lib/admin/inc/theme-widgets.php @@ -118,10 +118,10 @@ class SidebarPosts extends WP_Widget { $to_user = get_user_by('id', $to_user_id); ?>
    - FROM:
    - TO: ID); ?> + FROM:
    + TO: ID); ?> - TO: ID, 'ghostpool_destination_user_name', true); ?> + TO: ID, 'ghostpool_destination_email', true); ?>
    diff --git a/wp-content/themes/score/lib/images/vimeo.png b/wp-content/themes/score/lib/images/vimeo.png new file mode 100644 index 0000000000000000000000000000000000000000..ec2757f971ce818a99ddd99fb7ef3278f8988e8f GIT binary patch literal 1715 zcmaJ?X;2eq7|uWsMQSX-v{+@Nf{1lIxDPYVC-k>JsJn$87E`hmDgjqhdW1k3!75yV0ufpy6OBg^ zRYC4|XaIv@$_lflmZlJrUsL6#yWdAfJP-iM4S`~zpBRLInTJD1 zBUEZ}JRCX`i(W}MSrnxc^LTo_o~!ra;zTA75{X1Skk8}uy=jCuS%6W9!5br8XBA+S zR1z8;rNJ@4tcWP^JW9f$oxV#!t9vhtkuznY3&t}bIv&IY%_+?S02p`oM+fQp zu>U&f*)6(z%+vR6OE2CxK8n%ZPS9=51M*GuZSjbJgA)z6N2{~5b|Q-|4e9GTYMn~d zIfs#wQQxm^VP4+OaI<~d9vxJ!y^Mqvfb0&Ob^5LzUnW08)FM*dBer{$8 zh@x`;<+q8ZTQ`^j-(rr5^)#y9(OupcvLpR%^s~<`cyCIb%0_L50$((6zchNZIyVmx zP)vZM@L2!wJwrc~AT0efdyQU&UjEpf`tIWZF>ajg8+k z{Gm3+Y_I*|<5364C4KRJ_?bcHujk!=dt#j+3(3mvrJ873+<^h)0D z&tA~r{-QyuRYB^d4^p;vZ-QUhTlpJm>rRF=W%j;grIz^$oyLxB7$wQ7$gay5i2BtY zjeD36sJdi(#G=&eu$u2*D3Sy;6`f0PO)7*d9&RiRKaz6D@q*v|{WUIv23>!Uz?=E1 c?zL?O!~I$pHdxhl*8CfZkj21lAsJi#0khkVZ~y=R literal 0 HcmV?d00001 diff --git a/wp-content/themes/score/lib/images/youtube.png b/wp-content/themes/score/lib/images/youtube.png new file mode 100644 index 0000000000000000000000000000000000000000..d91233a913495994a2191b65d5f034fe9433183d GIT binary patch literal 2250 zcmV;*2sQVKP)Rt-LKF*z6^0SEZomvB zU|AUvBNpp5W5wN^dJlol#$yLy7<00pe6lCMZ{IvGIS4p5ynG%6K&2^4VR-WqB@9uV zVwpe@6^}+>ltf{a#wcYlDk@-{_IFo1O%ht6t@y&l&vPLqQe6^#aV^v*U-QD@~=WopAa^G%mZ~t*sRaK(7x%m}N z`SKC8hvRwQ&AtDAg9g586|GiwUs*nPFMkR1^xu6T!v~djCrp6R)C9My3*kF=I2MLy zE4VoaW;zdJC8b5pX zZ1b8mYo6S+X%iMMT-Z)8?D+r82lD;>nwSwgvH^QRT3Xk-k46!A2RkvqxCq0lEN46s%uot$qQBM! z8qHwukC!c5#=X<%?Civ`W5+OQ(j?5DJ^Sc!RI5S&w|;AFEffA}M)Y1812 z9u1RTQVk8-3z`XabqKxo8r165Pz0$sKR0~_LR(s4ytn~5gVeg!2QQg|N+wG@+pe|( z0Oy;Unr=;;IC0#*efz`;5b070}dwHJgcxFMW{KLwX&nTCdo<+*0ILaNFV{^{%y#N~q=W@*P{Bb*%g-vS@k0S_nHD@N& z_;Efk7C1YX*Ks84S_Lt9WbWKK|DtuLHa0d&U>~D0U#BG}ih|5kT7=*7qT{#)09aM! z#~p0hSUFlej!PPqp8$~Rs}&Lt6@c-E!Fcy8vj*w-MjH3aw;-|Q(s-_&*M9LFgXPZiwAgbj#yp6asLy5 zC{{Sf3zA*Wx^-~w+=f@o${deFk+zcQ1c3QK8gv{pPksiJa)b1)0Y#%lfyGtOxp^p#aCMS1`rC7KKXRPcu)jWUwi>;!ME_l zd+$L_sMQqW<_6=#v>wjoN+~Upl^NK1i`nDQp+h)x=8S$`TU(18H*Vw00taJS|^ZR+cuy;d>7QutXVAn#bKKQ>GkeHE!I#eY>_&OG^uwZu`5sx=K0E z+O=yJrZJ~Sqfr4cWHEC%MbU9!-WLxUq>UZF2V1yngpj?_i|qC57|og!KYUmU9~Gs? z$#1!iOc;;KB}OJn*OGWpq=tCL8dD_=H}dRx!nCLxWStOGvEA2)BKAe@&>&ptWW}3I zx6!ZFYXJG)UeM}r%gZtO;K4Ja>uO(rpq-||(!9(Q`f#jMJj^k6WLPMBP`WrC7q4=B z3D38sOi`*SpD}FLe*X45zs<63Fxdv{PE+V8XEO-5ApPpTUt(f-T=~~tkm>aE;7dV3 z=x$cVl1UgXYccaT+ux0v<{Mw>d*HwILjv~JojVuLwf?Ne?C4|+xFh|)G5pmcf8HZ> zhW?+QiFC>&IL3!NXBH;^x-DJbFj)+J?y&+0KrFqTNW6RV^yvmC-p7iWfy%JOAO#d@ zD14XTc6lxY=LLCPC<3++{2GH9VLMV31;4^zG7DOy&e)kV`)X@yUgCR)zVa8@{{j$z zDCcPr)vMylB|O*g>`=z@y382PJ|lL<$hB!2@PEiqdJI1=4e*>YID, 'ghostpool_thumbnail_height', true) && get_post_meta $gp_settings['artist'] = get_post_meta($post->ID, 'ghostpool_dedication_artist', true); $gp_settings['song'] = get_post_meta($post->ID, 'ghostpool_dedication_song', true); $gp_settings['artist_song'] = $gp_settings['artist'] . '. ' . $gp_settings['song']; +$gp_settings['artist_song_span'] = '' . $gp_settings['artist'] . '. ' . $gp_settings['song']; +$gp_settings['artist_song_span_short'] = cutstr($gp_settings['artist_song_span'], 38, ''); +if ($gp_settings['artist_song_span_short'] != $gp_settings['artist_song_span']) { + $gp_settings['artist_song_span_short'] .= '...'; +} // from user $gp_settings['from_user_id'] = get_the_author_meta('ID'); -$gp_settings['from_user_link'] = bp_core_get_userlink($gp_settings['from_user_id']); +$gp_settings['from_user_link'] = ''.bp_core_get_username($gp_settings['from_user_id']).''; + //bp_core_get_userlink($gp_settings['from_user_id']); $gp_settings['from_flag'] = gp_get_the_flag($gp_settings['from_user_id']); // to user @@ -34,7 +40,8 @@ $gp_settings['to_user'] = get_user_by ('id', $gp_settings['to_user_id']); if ($gp_settings['to_user']) { $gp_settings['to_flag'] = gp_get_the_flag($gp_settings['to_user']->ID, 24); - $gp_settings['to_user_link'] = bp_core_get_userlink($gp_settings['to_user']->ID); + $gp_settings['to_user_link'] = ''.bp_core_get_username($gp_settings['to_user']->ID).''; + //bp_core_get_userlink($gp_settings['to_user']->ID); } else { $gp_settings['to_flag'] = gp_get_the_flag('', 24); $gp_settings['to_user_link'] = get_post_meta($post->ID, 'ghostpool_destination_user_name', true); diff --git a/wp-content/themes/score/members/members-loop.php b/wp-content/themes/score/members/members-loop.php index e0c2d5f..a46f134 100644 --- a/wp-content/themes/score/members/members-loop.php +++ b/wp-content/themes/score/members/members-loop.php @@ -44,7 +44,7 @@
    - + diff --git a/wp-content/themes/score/members/single/small-member-header.php b/wp-content/themes/score/members/single/small-member-header.php index f25187a..2bf0350 100644 --- a/wp-content/themes/score/members/single/small-member-header.php +++ b/wp-content/themes/score/members/single/small-member-header.php @@ -14,7 +14,7 @@
    - + ()
     dedications->get_count_dedications_from_user(bp_displayed_user_id()); ?>
    diff --git a/wp-content/themes/score/post-loop-dedication.php b/wp-content/themes/score/post-loop-dedication.php index d5cd547..e5b8bcf 100644 --- a/wp-content/themes/score/post-loop-dedication.php +++ b/wp-content/themes/score/post-loop-dedication.php @@ -65,6 +65,10 @@

    + + FROM: + + TO:
    diff --git a/wp-content/themes/score/video-slider.php b/wp-content/themes/score/video-slider.php index 7db6ad7..1934850 100644 --- a/wp-content/themes/score/video-slider.php +++ b/wp-content/themes/score/video-slider.php @@ -138,11 +138,13 @@ if (have_posts()) { - FROM: + FROM: + + ID); - ?>TO: ID); ?> + gp_the_flag($to_user->ID); + ?>TO: ID); ?> TO: ID, 'ghostpool_destination_user_name', true); ?> @@ -179,8 +181,8 @@ if (have_posts()) {
    - Dedicate this song - Dedicate a song + Dedicate this song + Dedicate a song