# HG changeset patch # User Raphael Velt # Date 1331046787 -3600 # Node ID 5dd170a735e9f325f267d376e5de5e8bd5f078ca # Parent 8276f3ff7a3f053fc388142038557ded1cfd0ea4 new embed and share buttons diff -r 8276f3ff7a3f -r 5dd170a735e9 web/about.php --- a/web/about.php Tue Mar 06 13:22:18 2012 +0100 +++ b/web/about.php Tue Mar 06 16:13:07 2012 +0100 @@ -23,7 +23,6 @@ - - - - - - - - - - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> - - - - - - - -
-
- - - - - - - - -
- -
- - - - - - - - - -
- 0):?> -
- -
- -
- -
- - -
- - -
- -
-
-
-
- _('config__title')); ?>
-
-
_('config__description')); ?>
- - -
- -
-

_("ClientTitle1 :"); ?>

-
- - ".$translate->_("Vous n'êtes pas connecté.")."
"); - }else{ - echo(""); - } - ?> - - -
- _("Envoyé"); ?>

-
- -
- _("Erreur1"); ?>
 


-
- - - - - _("Envoyer"); ?> - - - - - - ++ - -- - == - ?? - -
- -
- -
- -
-
- _('config__partenaires')); - - if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])){ - echo("| ".$translate->_("Déconnexion").""); - } - ?> - - -
- - - - - - diff -r 8276f3ff7a3f -r 5dd170a735e9 web/common.php --- a/web/common.php Tue Mar 06 13:22:18 2012 +0100 +++ b/web/common.php Tue Mar 06 16:13:07 2012 +0100 @@ -219,13 +219,11 @@ $font_registry = array( 'local' => array( 'PT-Sans_Narrow' => URL_ROOT.'res/fonts/PT_Sans-Narrow-Web-Regular.css', - 'PT-Sans' => URL_ROOT.'res/fonts/PT_Sans-Web-Regular.css', - 'Geo' => URL_ROOT.'res/fonts/Geo-Regular.css' + 'PT-Sans' => URL_ROOT.'res/fonts/PT_Sans-Web-Regular.css' ), 'cdn' => array( 'PT-Sans_Narrow' => 'http://fonts.googleapis.com/css?family=PT+Sans+Narrow&subset=latin', - 'PT-Sans' => 'http://fonts.googleapis.com/css?family=PT+Sans&subset=latin', - 'Geo' => 'http://fonts.googleapis.com/css?family=Geo&subset=latin' + 'PT-Sans' => 'http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' ) ); diff -r 8276f3ff7a3f -r 5dd170a735e9 web/embed_form.php --- a/web/embed_form.php Tue Mar 06 13:22:18 2012 +0100 +++ b/web/embed_form.php Tue Mar 06 16:13:07 2012 +0100 @@ -20,7 +20,6 @@ ' rel='stylesheet' type='text/css'> ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> + + + +

_("EmbedTitle"); ?>

+ +

_("EmbedText"); ?>

+ + + + diff -r 8276f3ff7a3f -r 5dd170a735e9 web/polemicaltimeline.php --- a/web/polemicaltimeline.php Tue Mar 06 13:22:18 2012 +0100 +++ b/web/polemicaltimeline.php Tue Mar 06 16:13:07 2012 +0100 @@ -135,7 +135,8 @@ live: true, height: 400, width: 650, - provider: "rtmp" + provider: "rtmp", + autostart: true }, modules: [ { type: "MediaFragment", @@ -169,7 +170,11 @@ 'type' : 'iframe' }); jQuery(".acctitre").click(function() { - jQuery(this).next().slideToggle(); + var _nx = jQuery(this).next(); + if (_nx.is(":hidden")) { + jQuery(".acctexte").slideUp(); + _nx.slideDown(); + } }) }); @@ -256,30 +261,30 @@ - +
@@ -288,8 +293,8 @@ diff -r 8276f3ff7a3f -r 5dd170a735e9 web/res/css/twcx-img/embedbutton.png Binary file web/res/css/twcx-img/embedbutton.png has changed diff -r 8276f3ff7a3f -r 5dd170a735e9 web/res/css/tweetcast.css --- a/web/res/css/tweetcast.css Tue Mar 06 13:22:18 2012 +0100 +++ b/web/res/css/tweetcast.css Tue Mar 06 16:13:07 2012 +0100 @@ -170,6 +170,10 @@ float: right; width: 216px; height: 32px; margin-top: 15px; } +.embed .embedbar { + display: none; +} + a.embedbutton { display: block; float: left; background: url(twcx-img/embedbutton.png); text-decoration: none; font-size: 13px; width: 64px; text-align: center; height: 19px; padding-top: 13px; @@ -484,7 +488,7 @@ /* Colonne de droite */ #onglets { - float: left; width: 441px; margin: 43px 25px 0; list-style: none; + float: left; width: 441px; margin: 22px 25px 0; list-style: none; border-left: 1px solid #999; } @@ -626,7 +630,7 @@ } #mdpgauche li.acctexte { - max-height: 300px; + max-height: 450px; } .acctexte ul { diff -r 8276f3ff7a3f -r 5dd170a735e9 web/res/fonts/Geo-Regular.css --- a/web/res/fonts/Geo-Regular.css Tue Mar 06 13:22:18 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -@font-face { - font-family: 'Geo'; - font-style: normal; - font-weight: normal; - src: local('Geo'), local('Geo-Regular'), url('Geo-Regular.woff') format('woff'); -} diff -r 8276f3ff7a3f -r 5dd170a735e9 web/res/fonts/Geo-Regular.woff Binary file web/res/fonts/Geo-Regular.woff has changed