[geeklog-cvs] geeklog: Merge with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Mar 20 12:34:26 EDT 2012
changeset 8542:2593957646db
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2593957646db
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 20 12:32:59 2012 -0400
description:
Merge with upstream
diffstat:
language/english.php | 7 ++-
language/english_utf-8.php | 7 ++-
public_html/images/facebook-login-icon.png | Bin
public_html/images/linkedin-login-icon.png | Bin
public_html/images/login-with-facebook.png | Bin
public_html/images/login-with-linkedin.png | Bin
public_html/images/login-with-twitter.png | Bin
public_html/images/openid_login_icon.png | Bin
public_html/images/twitter-login-icon.png | Bin
public_html/javascript/login.js | 21 +++++++++
public_html/layout/newpro/css/form.css | 39 ++++++++++++++++-
public_html/layout/newpro/loginform.thtml | 18 +++----
public_html/layout/newpro/loginform_oauth.thtml | 5 +-
public_html/layout/newpro/loginform_openid.thtml | 17 ++++--
public_html/layout/professional/functions.php | 3 +
public_html/layout/professional/loginform.thtml | 2 +-
public_html/layout/professional/loginform_oauth.thtml | 5 +-
public_html/layout/professional/loginform_openid.thtml | 17 +++++-
public_html/layout/professional/style.css | 33 +++++++++++++-
public_html/layout/professional/users/loginform.thtml | 8 ++-
public_html/lib-common.php | 14 +++--
system/lib-security.php | 8 ++-
22 files changed, 162 insertions(+), 42 deletions(-)
diffs (truncated from 441 to 300 lines):
diff -r 3a159d1973f2 -r 2593957646db language/english.php
--- a/language/english.php Tue Mar 20 12:10:54 2012 -0400
+++ b/language/english.php Tue Mar 20 12:32:59 2012 -0400
@@ -169,7 +169,7 @@
125 => 'Are you sure you want to Delete all checked items?',
126 => 'Select or de-select all items',
127 => 'Permalink',
- 128 => 'Login with OpenID:',
+ 128 => 'Login with OpenID',
129 => 'Configuration',
130 => 'Webservices',
131 => 'No HTML is allowed',
@@ -180,7 +180,10 @@
136 => 'Warning: Javascript recommended for enhanced functionality',
137 => 'Warning: Javascript required to enable functionality',
138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
- 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
+ 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage",
+ 'facebook' => 'Login with Facebook',
+ 'twitter' => 'Login with Twitter',
+ 'linkedin' => 'Login with LinkedIn'
);
###############################################################################
diff -r 3a159d1973f2 -r 2593957646db language/english_utf-8.php
--- a/language/english_utf-8.php Tue Mar 20 12:10:54 2012 -0400
+++ b/language/english_utf-8.php Tue Mar 20 12:32:59 2012 -0400
@@ -169,7 +169,7 @@
125 => 'Are you sure you want to Delete all checked items?',
126 => 'Select or de-select all items',
127 => 'Permalink',
- 128 => 'Login with OpenID:',
+ 128 => 'Login with OpenID',
129 => 'Configuration',
130 => 'Webservices',
131 => 'No HTML is allowed',
@@ -180,7 +180,10 @@
136 => 'Warning: Javascript recommended for enhanced functionality',
137 => 'Warning: Javascript required to enable functionality',
138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
- 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
+ 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage",
+ 'facebook' => 'Login with Facebook',
+ 'twitter' => 'Login with Twitter',
+ 'linkedin' => 'Login with LinkedIn'
);
###############################################################################
diff -r 3a159d1973f2 -r 2593957646db public_html/images/facebook-login-icon.png
Binary file public_html/images/facebook-login-icon.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/images/linkedin-login-icon.png
Binary file public_html/images/linkedin-login-icon.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/images/login-with-facebook.png
Binary file public_html/images/login-with-facebook.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/images/login-with-linkedin.png
Binary file public_html/images/login-with-linkedin.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/images/login-with-twitter.png
Binary file public_html/images/login-with-twitter.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/images/openid_login_icon.png
Binary file public_html/images/openid_login_icon.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/images/twitter-login-icon.png
Binary file public_html/images/twitter-login-icon.png has changed
diff -r 3a159d1973f2 -r 2593957646db public_html/javascript/login.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/javascript/login.js Tue Mar 20 12:32:59 2012 -0400
@@ -0,0 +1,21 @@
+$(document).ready(function() {
+ // Show the openid button for JS-enabled browsers
+ $('form.third-party-login div').show();
+ $('form.third-party-login img').click(function() {
+ // Ensure that clicking on an icon will trigger the login action
+ $(this).prev().click();
+ });
+ $('form.third-party-login').submit(function(e) {
+ if ($(this).find('noscript').length) { // OpenId form submitted
+ e.preventDefault();
+ // Add a textbox for the identity provider url
+ // and change the text in the submit button
+ $(this)
+ .unbind('submit')
+ .find('> div')
+ .prepend(
+ $('<input/>', {'type':'text','name':'identity_url','value':'http://'})
+ );
+ }
+ });
+});
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/newpro/css/form.css
--- a/public_html/layout/newpro/css/form.css Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/newpro/css/form.css Tue Mar 20 12:32:59 2012 -0400
@@ -68,6 +68,15 @@
Login Form
--------------------------------------*/
+/* Input sizing */
+form#loginform input,
+form.third-party-login input {
+ width: 100%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
/* Form Item */
form#loginform dl {
margin: 0;
@@ -84,11 +93,15 @@
padding: 0;
}
+form#loginform input.submit {
+ height: 28px;
+ font-size: 12px;
+}
+
/* Form Option Menu */
form#loginform ul.navi {
list-style-position: outside;
list-style-type: none;
- margin: 0;
padding: 0;
}
@@ -97,3 +110,27 @@
padding: 0;
}
+/* Third party login */
+form.third-party-login {
+ margin: 0.1em 0;
+}
+
+form.third-party-login div {
+ position: relative;
+}
+
+form.third-party-login div img {
+ position: absolute;
+ left: 6px;
+ top: 6px;
+}
+
+form.third-party-login div input.submit {
+ text-indent: 24px;
+ font-size: 12px;
+ height: 28px;
+}
+
+div.third-party-login {
+ width: 164px;
+}
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/newpro/loginform.thtml
--- a/public_html/layout/newpro/loginform.thtml Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/newpro/loginform.thtml Tue Mar 20 12:32:59 2012 -0400
@@ -2,9 +2,7 @@
<!-- loginform.thtml { -->
<form action="{site_url}/users.php" method="post" id="loginform" class="basic">
- <fieldset>
- <legend>{lang_login}</legend>
-
+ <div>
<dl>
<dt><label for="loginform-loginname">{lang_username}</label></dt>
<dd><input type="text" size="12" value="" name="loginname" id="loginform-loginname" class="text"{xhtml}></dd>
@@ -18,14 +16,12 @@
<ul class="submit">
<li><input type="submit" value="{lang_login}" class="submit"{xhtml}></li>
</ul>
-
- <ul class="navi">
- <li>{lang_signup}</li>
- <li>{lang_forgetpassword}</li>
- </ul>
- </fieldset>
+ </div>
+ <ul class="navi">
+ <li>{lang_signup}</li>
+ <li>{lang_forgetpassword}</li>
+ </ul>
</form>
+{oauth_login}
{openid_login}
-{oauth_login}
-
<!-- } loginform.thtml -->
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/newpro/loginform_oauth.thtml
--- a/public_html/layout/newpro/loginform_oauth.thtml Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/newpro/loginform_oauth.thtml Tue Mar 20 12:32:59 2012 -0400
@@ -1,8 +1,9 @@
<!-- loginform_oauth.thtml { -->
-<form action="{site_url}/users.php?oauth_login={oauth_service}" method="post">
+<form class="third-party-login" action="{site_url}/users.php?oauth_login={oauth_service}" method="post">
<div>
- <input src="{oauth_sign_in_image}"{oauth_sign_in_image_style} type="image"{xhtml}>
+ <img alt="" src="{oauth_sign_in_image}"{xhtml}>
+ <input value="{lang_oauth_service}" type="submit" class="submit"{xhtml}>
</div>
</form>
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/newpro/loginform_openid.thtml
--- a/public_html/layout/newpro/loginform_openid.thtml Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/newpro/loginform_openid.thtml Tue Mar 20 12:32:59 2012 -0400
@@ -1,12 +1,17 @@
<!-- loginform_openid.thtml { -->
-
-<form action="{site_url}/users.php?openid_login=1" method="post">
+<form class="third-party-login" action="{site_url}/users.php?openid_login=1" method="post">
<div>
- <label for="identity_url">{lang_openid_login}</label><br{xhtml}>
- <input name="identity_url" id="identity_url" style='background: url("{site_url}/images/openid_login_icon.png") no-repeat;background-color:#fff;background-position:0 50%;color:#000;padding-left:18px;font-family:monospace;font-size:10px' value="http://" size="{input_field_size}"{xhtml}>
- <input src="{site_url}/images/right_arrow.png" style="padding:1px;margin-bottom:-5px;height:16px;width:16px;border:1px" type="image"{xhtml}>
+ <div style="display: none;">
+ <!-- this is revealed by login.js -->
+ <img alt="" src="{site_url}/images/openid_login_icon.png"{xhtml}>
+ <input value="{lang_openid_login}" type="submit" class="submit"{xhtml}>
+ </div>
+ <noscript>
+ <label for="identity_url">{lang_openid_login}</label><br{xhtml}>
+ <input name="identity_url" id="identity_url" style='background: url("{site_url}/images/openid_login_icon.png") no-repeat;background-color:#fff;background-position:0 50%;color:#000;padding-left:18px;font-family:monospace;font-size:10px' value="http://" size="{input_field_size}"{xhtml}>
+ <input src="{site_url}/images/right_arrow.png" style="padding:1px;margin-bottom:-5px;height:16px;width:16px;border:1px" type="image"{xhtml}>
+ </noscript>
</div>
</form>
-
<!-- } loginform_openid.thtml -->
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/professional/functions.php
--- a/public_html/layout/professional/functions.php Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/professional/functions.php Tue Mar 20 12:32:59 2012 -0400
@@ -10,6 +10,9 @@
// Add Theme CSS File to scripts class
$_SCRIPTS->setCSSFile('theme', '/layout/' . $_CONF['theme'] . '/style.css');
+// Load jQuery
+$_SCRIPTS->setJavaScriptLibrary('jquery');
+
/*
* For left/right block support there is no longer any need for the theme to
* put code into functions.php to set specific templates for the left/right
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/professional/loginform.thtml
--- a/public_html/layout/professional/loginform.thtml Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/professional/loginform.thtml Tue Mar 20 12:32:59 2012 -0400
@@ -10,5 +10,5 @@
</form>
<p>{lang_signup}<br{xhtml}>
{lang_forgetpassword}</p>
+{oauth_login}
{openid_login}
-{oauth_login}
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/professional/loginform_oauth.thtml
--- a/public_html/layout/professional/loginform_oauth.thtml Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/professional/loginform_oauth.thtml Tue Mar 20 12:32:59 2012 -0400
@@ -1,5 +1,6 @@
-<form action="{site_url}/users.php?oauth_login={oauth_service}" method="post">
+<form class="third-party-login" action="{site_url}/users.php?oauth_login={oauth_service}" method="post">
<div>
- <input src="{oauth_sign_in_image}"{oauth_sign_in_image_style} type="image"{xhtml}>
+ <img alt="" src="{oauth_sign_in_image}"{xhtml}>
+ <input value="{lang_oauth_service}" type="submit" class="submit"{xhtml}>
</div>
</form>
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/professional/loginform_openid.thtml
--- a/public_html/layout/professional/loginform_openid.thtml Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/professional/loginform_openid.thtml Tue Mar 20 12:32:59 2012 -0400
@@ -1,7 +1,16 @@
-<form action="{site_url}/users.php?openid_login=1" method="post">
+<form class="third-party-login" action="{site_url}/users.php?openid_login=1" method="post">
<div>
- <b><label for="identity_url">{lang_openid_login}</label></b><br{xhtml}>
- <input name="identity_url" id="identity_url" style='background: url("{site_url}/images/openid_login_icon.png") no-repeat;background-color:#fff;background-position:0 50%;color:#000;padding-left:18px;font-family:monospace;font-size:10px' value="http://" size="{input_field_size}"{xhtml}>
- <input src="{site_url}/images/right_arrow.png" style="padding:1px;margin-bottom:-5px;height:16px;width:16px;border:1px" type="image"{xhtml}>
+ <div style="display: none;">
+ <!-- this is revealed by login.js -->
+ <img alt="" src="{site_url}/images/openid_login_icon.png"{xhtml}>
+ <input value="{lang_openid_login}" type="submit" class="submit"{xhtml}>
+ </div>
+ <noscript>
+ <div>
+ <b><label for="identity_url">{lang_openid_login}</label></b><br{xhtml}>
+ <input name="identity_url" id="identity_url" style='background: url("{site_url}/images/openid_login_icon.png") no-repeat;background-color:#fff;background-position:0 50%;color:#000;padding-left:18px;font-family:monospace;font-size:10px' value="http://" size="{input_field_size}"{xhtml}>
+ <input src="{site_url}/images/right_arrow.png" style="padding:1px;margin-bottom:-5px;height:16px;width:16px;border:1px" type="image"{xhtml}>
+ </div>
+ </noscript>
</div>
</form>
diff -r 3a159d1973f2 -r 2593957646db public_html/layout/professional/style.css
--- a/public_html/layout/professional/style.css Tue Mar 20 12:10:54 2012 -0400
+++ b/public_html/layout/professional/style.css Tue Mar 20 12:32:59 2012 -0400
@@ -1117,6 +1117,37 @@
display: inline;
color: black;
}
-
/* End of Common Plugin CSS */
+/* Third party login */
+form.third-party-login {
+ margin: 0.1em 0;
More information about the geeklog-cvs
mailing list