Changeset 26604 for extensions/oAuth/template

Timestamp:

Jan 10, 2014, 9:51:32 PM (11 years ago)

Author:

mistic100

Message:

clean templating + allow to use Steam/Wordpress/Flickr without displaying OpenID

Location:

extensions/oAuth/template

Files:

• auth.tpl (modified) (1 diff)
• identification_common.tpl (modified) (5 diffs)
• identification_menubar.tpl (modified) (2 diffs)
• identification_page.tpl (modified) (1 diff)
• profile.tpl (modified) (1 diff)

extensions/oAuth/template/auth.tpl

@@ -30 +30 @@
 {elseif $REDIRECT_TO}
   <script type="text/javascript"> 
-    if (window.opener) window.opener.parent.redirect('{$REDIRECT_TO}');
+    if (window.opener) window.opener.parent.oauth_redirect('{$REDIRECT_TO}');
     window.self.close();
   </script>

extensions/oAuth/template/identification_common.tpl

@@ -12 +12 @@
 {footer_script}
 // redirect, called from the popup
-function redirect(type) {
-  var url = "{$REDIRECT_TO}";
-  if (typeof type != 'undefined' && type != 'default') {
-    url = "{$ABS_ROOT_URL}"+ type +".php";
+function oauth_redirect(type) {
+  var url = '{$OAUTH.u_redirect}';
+  if (type && type != 'default') {
+    url = '{$ABS_ROOT_URL}'+ type +'.php';
   }
 
@@ -24 +24 @@
 function open_auth(url) {
   window.open(
-    url+ "&t=" + (new Date()).getTime(), 
-    "hybridauth_social_sing_on", 
-    "location=0,status=0,scrollbars=0,width=800,height=500"
+    url + '&t=' + (new Date()).getTime(), 
+    'hybridauth_social_sign_on', 
+    'location=0,status=0,scrollbars=0,width=800,height=500'
   );  
 }
 
 // click on a button
-jQuery("a.oauth").click(function() {
+jQuery('a.oauth').click(function(e) {
+  e.preventDefault();
+  
   var idp = jQuery(this).data('idp');
   
@@ -38 +40 @@
       switch(idp) {
         case 'OpenID':
-          jQuery("#openid_label").html('{'Please enter your OpenID URL'|translate|escape:javascript}'); break;
+          jQuery('#openid_label').html('{'Please enter your OpenID URL'|translate|escape:javascript}'); break;
         case 'Wordpress': case 'Flickr': case 'Steam':
-          jQuery("#openid_label").html('{'Please enter your username'|translate|escape:javascript}'); break;
+          jQuery('#openid_label').html('{'Please enter your username'|translate|escape:javascript}'); break;
       }
       
@@ -47 +49 @@
         bg_color = $('body').css('background-color');
       }
-      jQuery("#openid_form").css('background-color', bg_color);
+      jQuery('#openid_form').css('background-color', bg_color);
 
-      jQuery("#openid_form .oauth_38px").removeClass().addClass("oauth_38px " + idp.toLowerCase());
-      jQuery("#openid_form h3").html(idp);
-      jQuery("#openid_form").data('idp', idp);
+      jQuery('#openid_form .oauth_38px').removeClass().addClass('oauth_38px ' + idp.toLowerCase());
+      jQuery('#openid_form h3').html(idp);
+      jQuery('#openid_form').data('idp', idp);
 
       jQuery.colorbox({
-        inline:true,
-        href:"#openid_form",
-        initialWidth:0,
-        initialHeight:0,
+        inline: true,
+        href: '#openid_form',
+        initialWidth: 0,
+        initialHeight: 0,
+        mawWidth: '100%',
         onComplete: function(){ jQuery.colorbox.resize({ speed:0 }) } // prevent misalignement when icon not loaded
-      })
+      });
       break;
       
     default:
-      open_auth("{$OAUTH_URL}"+ idp);
+      open_auth('{$OAUTH.u_login}'+ idp);
   }
-  
-  return false;
 });
 
-jQuery("#openid_form").submit(function() {
+jQuery('#openid_form').submit(function(e) {
+  e.preventDefault();
+  
   var idp = jQuery(this).data('idp');
-  var oi = jQuery("#openid_form input[name='openid_identifier']").val();
-  jQuery("#openid_form input[name='openid_identifier']").val('');
+  var oi = jQuery('#openid_form input[name=openid_identifier]').val();
+  jQuery('#openid_form input[name=openid_identifier]').val('');
   
-  jQuery("#openid_label").removeClass('error');
+  jQuery('#openid_label').removeClass('error');
   if (!oi) {
-    jQuery("#openid_label").addClass('error');
-    return false;
+    jQuery('#openid_label').addClass('error');
+    return;
   }
   
   switch(idp) {
-    case 'Wordpress': oi = "http://" + oi + ".wordpress.com"; break;
-    case 'Flickr': oi = "http://www.flickr.com/photos/" + oi + "/"; break;
-    case 'Steam': oi = "http://steamcommunity.com/openid/" + oi; break;
+    case 'Wordpress': oi = 'http://' + oi + '.wordpress.com'; break;
+    case 'Flickr': oi = 'http://www.flickr.com/photos/' + oi + '/'; break;
+    case 'Steam': oi = 'http://steamcommunity.com/openid/' + oi; break;
   }
 
-  open_auth("{$OAUTH_URL}OpenID&openid_identifier="+ encodeURI(oi));
+  open_auth('{$OAUTH.u_login}OpenID&openid_identifier=' + encodeURI(oi));
 
   jQuery.colorbox.close();
-  return false;
 });
 
-jQuery("#openid_cancel").click(function() {
-  jQuery("#openid_label").removeClass('error');
+jQuery('#openid_cancel').click(function(e) {
+  e.preventDefault();
+  
+  jQuery('#openid_label').removeClass('error');
   jQuery.colorbox.close();
-  return false;
 });
 {/footer_script}
@@ -107 +110 @@
     <div>
       <br>
-      <label id="openid_label" for="openid_identifier">Open ID URL</label>
+      <label id="openid_label" for="openid_identifier"></label>
       <br>
       <input type="text" name="openid_identifier" id="openid_identifier" size="50">

extensions/oAuth/template/identification_menubar.tpl

@@ -1 @@
-{if $id == "mbIdentification" and isset($U_LOGIN) and count($PROVIDERS)}
-  {if not $OAUTH_JS_LOADED}
-    {assign var=OAUTH_JS_LOADED value=true}
-    {include file=$OAUTH_ABS_PATH|cat:'template/identification_common.tpl'}
-  {/if}
+{if $id == "mbIdentification" and isset($U_LOGIN)}
   {html_style}
-    dl#mbIdentification dd:first-of-type { padding-bottom:0 !important; 
-    #mbIdentification .oauth { margin:0 1px; }
+  dl#mbIdentification dd:first-of-type { padding-bottom:0 !important; }
+  #mbIdentification .oauth { margin:0 1px; }
   {/html_style}
   
@@ -14 +10 @@
       <legend>{'Or sign in with'|translate}</legend>
       
-    {foreach from=$PROVIDERS item=provider key=p}{strip}
-      <a href="#" class="oauth oauth_{$oauth.menubar_icon} {$p|strtolower}" data-idp="{$p}" title="{$provider.name}"></a>
+    {foreach from=$OAUTH.providers item=provider key=p}{strip}
+      {if $provider.enabled}
+        <a href="#" class="oauth oauth_{$OAUTH.conf.menubar_icon} {$p|strtolower}" data-idp="{$p}" title="{$provider.name}"></a>
+      {/if}
     {/strip}{/foreach}
     </fieldset>

extensions/oAuth/template/identification_page.tpl

@@ -1 @@
-{if count($PROVIDERS)}
-  {if not $OAUTH_JS_LOADED}
-    {assign var=OAUTH_JS_LOADED value=true}
-    {include file=$OAUTH_ABS_PATH|cat:'template/identification_common.tpl'}
+{html_style}
+#oauth_wrap .oauth { margin:0 2px; }
+{/html_style}
+  
+<fieldset style="text-align:center;" id="oauth_wrap">
+  <legend>{'Or sign in with'|translate}</legend>
+  
+{foreach from=$OAUTH.providers item=provider key=p}{strip}
+  {if $provider.enabled}
+    <a href="#" class="oauth oauth_{$OAUTH.conf.identification_icon} {$p|strtolower}" data-idp="{$p}" title="{$provider.name}"></a>
   {/if}
-  {html_style}
-    #oauth_wrap .oauth { margin:0 2px; }
-  {/html_style}
-    
-  <fieldset style="text-align:center;" id="oauth_wrap">
-    <legend>{'Or sign in with'|translate}</legend>
-    
-  {foreach from=$PROVIDERS item=provider key=p}{strip}
-    <a href="#" class="oauth oauth_{$oauth.identification_icon} {$p|strtolower}" data-idp="{$p}" title="{$provider.name}"></a>
-  {/strip}{/foreach}
-  </fieldset>
-{/if}
+{/strip}{/foreach}
+</fieldset>

extensions/oAuth/template/profile.tpl

@@ -19 +19 @@
 
 <div id="oauth">
-{if $OAUTH_AVATAR}
-  <img src="{$OAUTH_AVATAR}" class="avatar">
+{if $OAUTH_USER.avatar}
+  <img src="{$OAUTH_USER.avatar}" class="avatar">
 {else}
   <img src="{$ROOT_URL}{$OAUTH_PATH}template/images/avatar-default.png" class="avatar">
 {/if}
 
-  {'Logged with'|translate} : <b>{$OAUTH_PROVIDER}</b><br>
-  <b>{'Username'|translate}</b> : {$OAUTH_USERNAME}<br>
-  {if $OAUTH_PROFILE_URL}<b>{'Profile URL'|translate}</b> : <a href="{$OAUTH_PROFILE_URL}">{$OAUTH_PROFILE_URL|truncate:40:' ... ':true:true}</a>{/if}
+  {'Logged with'|translate} : <b>{$OAUTH_USER.provider}</b><br>
+  <b>{'Username'|translate}</b> : {$OAUTH_USER.username}<br>
+  {if $OAUTH_USER.u_profile}<b>{'Profile URL'|translate}</b> : <a href="{$OAUTH_USER.u_profile}">{$OAUTH_USER.u_profile|truncate:40:' ... ':true:true}</a>{/if}
 </div>