Changeset 21584 for extensions/oAuth/template

Timestamp:

Mar 15, 2013, 6:43:07 PM (12 years ago)

Author:

mistic100

Message:

don't delete keys when the provider is removed, hide fieldset when no provider active, use jQuery instead of $

Location:

extensions/oAuth/template

Files:

• identification_common.tpl (modified) (4 diffs)
• identification_menubar.tpl (modified) (1 diff)
• identification_page.tpl (modified) (1 diff)

extensions/oAuth/template/identification_common.tpl

@@ -41 +41 @@
 
 // click on a button
-$("a.oauth").click(function() {
-  var idp = $(this).data('idp');
+jQuery("a.oauth").click(function() {
+  var idp = jQuery(this).data('idp');
   
   switch(idp) {
@@ -49 +49 @@
 {/literal}
         case 'OpenID':
-          $("#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':
-          $("#openid_label").html('{'Please enter your username'|@translate|escape:javascript}'); break;
+          jQuery("#openid_label").html('{'Please enter your username'|@translate|escape:javascript}'); break;
       }
       
-      $("#openid_form").css('background-color', $("#the_page #content").css('background-color'));
-      $("#openid_form .oauth_38px").removeClass().addClass("oauth_38px " + idp.toLowerCase());
-      $("#openid_form h3").html(idp);
-      $("#openid_form").data('idp', idp);
+      jQuery("#openid_form").css('background-color', $("#the_page #content").css('background-color'));
+      jQuery("#openid_form .oauth_38px").removeClass().addClass("oauth_38px " + idp.toLowerCase());
+      jQuery("#openid_form h3").html(idp);
+      jQuery("#openid_form").data('idp', idp);
 {literal}  
-      $.colorbox({
+      jQuery.colorbox({
         inline:true,
         href:"#openid_form",
         initialWidth:0,
         initialHeight:0,
-        onComplete:function(){ $.colorbox.resize({speed:0}) } // prevent misalignement when icon not loaded
+        onComplete:function(){ jQuery.colorbox.resize({speed:0}) } // prevent misalignement when icon not loaded
       })
       break;
@@ -77 +77 @@
 });
 
-$("#openid_form").submit(function() {
-  var idp = $(this).data('idp');
-  var oi = $("#openid_form input[name='openid_identifier']").val();
-  $("#openid_form input[name='openid_identifier']").val('');
+jQuery("#openid_form").submit(function() {
+  var idp = jQuery(this).data('idp');
+  var oi = jQuery("#openid_form input[name='openid_identifier']").val();
+  jQuery("#openid_form input[name='openid_identifier']").val('');
   
-  $("#openid_label").removeClass('error');
+  jQuery("#openid_label").removeClass('error');
   if (!oi) {
-    $("#openid_label").addClass('error');
+    jQuery("#openid_label").addClass('error');
     return false;
   }
@@ -95 +95 @@
   open_auth("{$OAUTH_URL}OpenID&openid_identifier="+ encodeURI(oi));
 {literal}
-  $.colorbox.close();
+  jQuery.colorbox.close();
   return false;
 });
 
-$("#openid_cancel").click(function() {
-  $("#openid_label").removeClass('error');
-  $.colorbox.close();
+jQuery("#openid_cancel").click(function() {
+  jQuery("#openid_label").removeClass('error');
+  jQuery.colorbox.close();
   return false;
 });

extensions/oAuth/template/identification_menubar.tpl

@@ -1 @@
-{if $id == "mbIdentification" and isset($U_LOGIN)}
+{if $id == "mbIdentification" and isset($U_LOGIN) and count($PROVIDERS)}
   {if not $OAUTH_JS_LOADED}
     {assign var=OAUTH_JS_LOADED value=true}

extensions/oAuth/template/identification_page.tpl

@@ -1 @@
-{if not $OAUTH_JS_LOADED}
-  {assign var=OAUTH_JS_LOADED value=true}
-  {include file=$OAUTH_ABS_PATH|cat:'template/identification_common.tpl'}
+{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'}
+  {/if}
+  {html_style}{literal}
+    #oauth_wrap .oauth {
+      margin:0 2px;
+    }
+  {/literal}{/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}
-{html_style}{literal}
-  #oauth_wrap .oauth {
-    margin:0 2px;
-  }
-{/literal}{/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>