# HG changeset patch # User veltr # Date 1354536388 -3600 # Node ID a94f5c62e4d767c86fbff34221a783e8dd065076 # Parent 1a78608617aa233032d39a5a339480df534fb0ce unified templates + modified login form popin diff -r 1a78608617aa -r a94f5c62e4d7 integration/css/common.css --- a/integration/css/common.css Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/css/common.css Mon Dec 03 13:06:28 2012 +0100 @@ -282,65 +282,63 @@ .button:hover{ background-color: #FF00FC } -.user.login h2, -.user.signup h2 { +.user-screen.login h2, +.user-screen.signup h2 { color: #de2500; font-size: 14px; font-weight: 600; margin-bottom: 12px; } -.user.info h2 { +.user-screen.info h2 { color: #7628df; font-size: 18px; font-weight: 600;margin-bottom: 2px; } -.user label{ +.user-screen label{ width: 84px; font-size: 12px; display: inline-block; line-height: 10px; } -.user p { +.user-screen p { display: block; line-height: 18px; margin-bottom: 8px; overflow: hidden; } -.user input[type=text], -.user input[type=password] { +.user-screen input[type=text], +.user-screen input[type=password] { position: relative; width: 110px; padding: 0 5px; height: 18px; display: inline-block; } -.user .button { +.user-screen .button { float: right; } /* popin - user - info */ -.user.info { +.user-screen.info { text-align: right; } -.user h3{ +.user-screen h3{ color: #30036d; font-size: 14px; margin-bottom: 10px; } -.user .nb-hashcut{ +.user-screen .nb-hashcut{ color: #de2500; font-size: 14px; text-decoration: underline; display: block; margin-bottom: 12px; } -.user .nb-hashcut:hover{ +.user-screen .nb-hashcut:hover{ text-decoration: none; } -.user.popin.info .popin-content a.change-account:hover{ - background-color: #FF00FC; -} + /* popin - user - signup */ .signup-button{ background-color: #de2500; @@ -997,3 +995,7 @@ .media-segment-popin span{ color: #7628df; } + +.hide { + display: none; +} diff -r 1a78608617aa -r a94f5c62e4d7 integration/edition.html --- a/integration/edition.html Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/edition.html Mon Dec 03 13:06:28 2012 +0100 @@ -27,68 +27,60 @@ -
-
-
-

Mashup75

-

mash@cinecast.fr

- 12 Hashcuts -

- -

-
-
- -
+
-

Créer un compte :

- -
- -
@@ -374,6 +366,8 @@ tags__icontains: "Hashcut" } }); + + $(".change-account").remove(); }); diff -r 1a78608617aa -r a94f5c62e4d7 integration/home.html --- a/integration/home.html Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/home.html Mon Dec 03 13:06:28 2012 +0100 @@ -25,68 +25,60 @@ -
-
-
-

Mashup75

-

mash@cinecast.fr

- 12 Hashcuts -

- -

-
-
- -
+
-

Créer un compte :

- -
- -
@@ -216,5 +208,18 @@ + diff -r 1a78608617aa -r a94f5c62e4d7 integration/js/common.js --- a/integration/js/common.js Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/js/common.js Mon Dec 03 13:06:28 2012 +0100 @@ -12,15 +12,79 @@ }); $(".change-account").click(function() { - $(".user").hide(); - $(".user.login").show(); + $(".user-screen").hide(); + $(".user-screen.login").show(); }); $(".signup-button").click(function() { - $(".user").hide(); - $(".user.signup").show(); + $(".user-screen").hide(); + $(".user-screen.signup").show(); }); $(".login-form, .signup-form").submit(function() { $(".user").hide(); + $(".user-screen").hide(); + $(".user-screen.info").show(); }); -}); \ No newline at end of file +}); + +// Social Plug-in + +(function() { + +var uid = 0; + +window.social = function(opts) { + + var opts = opts || {}; + opts.sel = opts.sel || $(".Ldt-Social"); + opts.url = opts.url || document.location.href; + + if (opts.swf) { + ZeroClipboard.setMoviePath(opts.swf); + } + + var text = opts.sel.find("title").text(), + clipId = "Social-Clip-" + (++uid), + clip; + + opts.sel.find(".Ldt-Social-CopyBtn").attr("id", clipId); + + opts.sel.find(".Ldt-Social-Url").click(function() { + var _pop = opts.sel.find(".Ldt-Social-UrlPop"); + _pop.toggle(); + if (_pop.is(":visible")) { + if (typeof clip == "undefined") { + clip = new ZeroClipboard.Client(); + clip.setHandCursor( true ); + clip.glue(clipId); + + clip.addEventListener( 'onMouseUp', function() { + _pop.hide(); + clip.hide(); + }); + } + clip.show(); + clip.setText( opts.url ); + opts.sel.find(".Ldt-Social-Input").val(opts.url).focus(); + } else { + clip.hide(); + } + return false; + }); + opts.sel.find(".Ldt-Social-Input").focus(function() { + this.select(); + }); + opts.sel.find(".Ldt-Social-Ext").click(function() { + window.open( + opts.sel.find(this).attr("href"), + "_blank", + "height=300,width=450,left=100,top=100,toolbar=0,menubar=0,status=0,location=0"); + return false; + }); + + opts.sel.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + $.param({ u: opts.url, t: text })); + opts.sel.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + $.param({ url: opts.url, text: text })); + opts.sel.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + $.param({ url: opts.url, title: text })); + opts.sel.find(".Ldt-Social-Mail").attr("href", "mailto:?" + $.param({ subject: text, body: text + ": " + opts.url })); +} +}()); \ No newline at end of file diff -r 1a78608617aa -r a94f5c62e4d7 integration/js/compile.bat --- a/integration/js/compile.bat Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/js/compile.bat Mon Dec 03 13:06:28 2012 +0100 @@ -8,8 +8,6 @@ copy hashcut.js ..\..\src\hashcut\static\hashcut\js -copy social.js ..\..\src\hashcut\static\hashcut\js - copy common.js ..\..\src\hashcut\static\hashcut\js copy ..\css\*.css ..\..\src\hashcut\static\hashcut\bpi\css diff -r 1a78608617aa -r a94f5c62e4d7 integration/js/compile.sh --- a/integration/js/compile.sh Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/js/compile.sh Mon Dec 03 13:06:28 2012 +0100 @@ -11,8 +11,6 @@ cp hashcut.js ../../src/hashcut/static/hashcut/js -cp social.js ../../src/hashcut/static/hashcut/js - cp common.js ../../src/hashcut/static/hashcut/js cp ../css/*.css ../../src/hashcut/static/hashcut/bpi/css diff -r 1a78608617aa -r a94f5c62e4d7 integration/js/social.js --- a/integration/js/social.js Sat Dec 01 23:48:11 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -(function() { - -var uid = 0; - -window.social = function(opts) { - - var opts = opts || {}; - opts.sel = opts.sel || $(".Ldt-Social"); - opts.url = opts.url || document.location.href; - - if (opts.swf) { - ZeroClipboard.setMoviePath(opts.swf); - } - - var text = opts.sel.find("title").text(), - clipId = "Social-Clip-" + (++uid), - clip; - - opts.sel.find(".Ldt-Social-CopyBtn").attr("id", clipId); - - opts.sel.find(".Ldt-Social-Url").click(function() { - var _pop = opts.sel.find(".Ldt-Social-UrlPop"); - _pop.toggle(); - if (_pop.is(":visible")) { - if (typeof clip == "undefined") { - clip = new ZeroClipboard.Client(); - clip.setHandCursor( true ); - clip.glue(clipId); - - clip.addEventListener( 'onMouseUp', function() { - _pop.hide(); - clip.hide(); - }); - } - clip.show(); - clip.setText( opts.url ); - opts.sel.find(".Ldt-Social-Input").val(opts.url).focus(); - } else { - clip.hide(); - } - return false; - }); - opts.sel.find(".Ldt-Social-Input").focus(function() { - this.select(); - }); - opts.sel.find(".Ldt-Social-Ext").click(function() { - window.open( - opts.sel.find(this).attr("href"), - "_blank", - "height=300,width=450,left=100,top=100,toolbar=0,menubar=0,status=0,location=0"); - return false; - }); - - opts.sel.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + $.param({ u: opts.url, t: text })); - opts.sel.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + $.param({ url: opts.url, text: text })); - opts.sel.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + $.param({ url: opts.url, title: text })); - opts.sel.find(".Ldt-Social-Mail").attr("href", "mailto:?" + $.param({ subject: text, body: text + ": " + opts.url })); -} -}()); -/* END social.js */ diff -r 1a78608617aa -r a94f5c62e4d7 integration/media.html --- a/integration/media.html Sat Dec 01 23:48:11 2012 +0100 +++ b/integration/media.html Mon Dec 03 13:06:28 2012 +0100 @@ -35,7 +35,7 @@
-
+

Créer un compte :

@@ -64,7 +64,7 @@
-
+