/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 38508

Added by Eri Katsari over 9 years ago

new seperate forms for registeration; update for sleeker look and feel; fixed modal messages on register

modules/uoa-joomla/trunk/joomla-3.4/modules/mod_bt_login/helper.php
201	201	}
202	202	else{
203	203	$document->addStyleSheet(JURI::root(true).'/modules/mod_bt_login/tmpl/css/style2.0.css');
204		$document->addStyleSheet(JURI::root(true).'/modules/mod_bt_login/tmpl/css/login.css');
	204
205	205	}
206	206
207	207	}

         text-align: left;
     	font-size:12px;
     	position:relative;
      width: 280px;
      height: 630px;
      width: 260px;
      height: 520px;
+    }
     .btl-content-block form{
     	margin:0;
-...
     	font-size:18px;
+    }
     .omb_authTitle{
        font-family: Roboto;
            font-weight: light  important;
     	line-height: 35px;
     	margin:0px;
              padding: 3px 0px 0px 19px!important;
     	text-transform: uppercase;
     	font-size:18px;
+    }
     #btl-success
+    {
      font-family: Roboto;
     	line-height: 25px;
+    }
     #btl-success h3
+    {
      font-family: Roboto !important;
+    }
     .btl-input > input[type=text],
     .btl-input > input[type=password],
     #recaptcha > input{
-...
+    }
     .btl-error-detail{
     	display:none;
     	float: right;
     	float: left;
     	color: #FF0000;
     	margin-bottom:4px;
+    }
-...
     	margin-right:25px!important;
     	overflow:hidden;
+    }
     #register-link{
     	margin-left:20px;
     	margin-right:25px!important;
     	overflow:hidden;
     	font-size:15px;
+    }
     #register-link div a{
     	font-size:17px;
+    }
      .btl-label{
     	float:left!important;
     	font-size: 13px!important;
+    }
      .btl-input{
     	float:right!important;
     	float:left!important;
+    }
     .btl-label, .btl-input {
               height:38px;
-...
     #btl-input-remember{
     font-size: 12px;
      color: grey;
     margin-left: 0px;margin-right: 57%; margin-top: 10px;
     margin-left: 8%;
     margin-top: 10px;
+    }
     #btl-checkbox-remember{
-...
     #btl-content {
      /*font-family: Proxima Nova ;*/
      font-family:  Century Gothic
      font-family:  Roboto ;
+    }
     #btl-content ul li a:hover{
-...
     	position:absolute!important;
     	z-index:9999;
+    }
     #btl-content #btl-content-login{
     	width:300px;
     #btl-re #btl-content-login{
     	width:250px;
     	height: 540px;
+    }
     #btl-content-registration{
     	 width: 360px; height:810px;
     	 width: 250px; height:300px;
+    }
     #btl-content-registration-modal{
     	font-family:roboto;
+    }
     .btl-note,#register-link{
     	padding:18px 0px;
+    }
      #btl-content-login .btl-input{
     	float:right;
     	float:left;
+    }
     #btl-content-login .spacer{
     	height:14px;
-...
+    }
     #btl-login-button
     {height: 38px; width: 130px; text-transform: none ! important; margin-right: 42%; font-family: Century Gothic! important; font-size: 15px;}
     {height: 38px;
     width: 110px;
     text-transform: none ! important;
      margin-left: 9.2%;
     float:left;
     font-family:
     Roboto! important;
     font-size: 15px;}
     #btl-forgot
     {padding-left: 0px; margin-left: 0px; margin-top: 20px;margin-right: 28%;}
+    {
     float:left;
     padding-left: 0px ! important;
      margin-left: -3%;
       margin-top: 20px;
+    }
     #btl-content #btl-content-profile #module-in-profile ul{
     	position: static;
     	text-align: left;
-...
     	color: #6b6b6b;
     	text-decoration: none !important;
     	text-transform: none!important;
     	font-family: arial,tahoma;
     	font-family: roboto;
+    }
-...
     	padding-left:1px;
+    }
     /* style panel when register success */
     #btl-success{
     	 display: none;
-...
     */
+    }
     #registration-id
     {  }
      #btl-content-registration-modal.uk-modal.uk-open div.uk-modal-dialog
+    {
     width:420px;
+    }
     /* style for ul in login panel*/
     #bt_ul {font-size: 10px;
     list-style-type: none;
     	margin-top:20 px!important;
     	margin-bottom:20px!important;
     	margin-right: 25px!important;
     	float:right;
     	float:left;
     	line-height: 1.3;
+    }
-...
+     }
     #btl-social div.uk-grid hr{
      width: 200px; margin-top: 50px;
      width: 200px;
      height:5px;
+     }
-...
      display: inline-block;padding-left:0px;
      width: 240px;
        margin-top: 10px;
+     }
      #socialMsg{
      float:left;
+      }
      #btl-horizontal-list li{
      padding: .2em  ;
      display: inline-block;padding-left:0px;
-...
+    }
      #btl-content-registration.btl-content-block div#btl-social
+    {
     margin-top:10px;
+    }
      #register-button{
        height: 40px;
        width: 120px;
        text-transform: none ! important;
        margin-right: 60px;
        font-family: Roboto! important;
        font-size: 15px;
+    }
       #btl-content-profile.btl-content-block
     {height: 344px;
      width: 220px;
+    }
       #btl-content-registration-modal.btl-register-modal form.btl-formregistration p.omb_authTitle
     {font-size:24px;
     /*
     color:#2d72d6;
     */
+    }
       .btl-note-small{
      font-size: 10px;
      font-family: "Roboto";
      width: 200px;
+     }
     .loginLink:hover, .loginLink:focus {
         color: #50bdd4 !important;
         text-decoration: none !important;
+    }
     .loginLink {
         color: #646464 !important;
+    }
+        }

     			<?php
     			  $BT_REGISTER="REGISTER";
     			$BT_LOGIN="LOGIN  |  ";
     			$BT_LOGIN="SIGN IN   ";
     			 $BT_SEPERATOR="|";
     			if($params->get('enabled_login_tab', 1)){
     			?>
     			<span id="btl-panel-login" class="<?php echo $effect;?>"><?php echo JText::_($BT_LOGIN);?></span>
     			<span  style="color: rgb(255, 255, 255); background-color: rgb(45, 114, 214); border: medium none rgb(255, 255, 255);" id="btl-panel-login" class="<?php echo $effect;?>">
     			<a class="loginLink"> <?php echo JText::_($BT_LOGIN);?></span></a>
     			 <?php echo JText::_($BT_SEPERATOR);?>
     			<?php }?>
     			<!-- Registration button -->
     			<?php
     			//$enabledRegistration=false;
     			if($enabledRegistration && $params->get('enabled_registration_tab')){
     				$option = JRequest::getCmd('option');
     				$task = JRequest::getCmd('task');
     				if($option!='com_user' && $task != 'register' ){
     			?>
     			<span id="btl-panel-registration" class="<?php echo $effect;?>"><?php echo JText::_($BT_REGISTER);?></span>
     			<span   style="color: rgb(255, 255, 255); background-color: rgb(45, 114, 214); border: medium none rgb(255, 255, 255);" id="btl-panel-registration"
     			 class="<?php echo $effect;?>">
     			 <a class="loginLink"> <?php echo JText::_($BT_REGISTER);?> </a></span>
     			<?php }
     			} ?>
-...
     		<?php endif; ?>
     	</div>
     	<!-- content dropdown/modal box -->
     	<div id="btl-content" >
     		<?php if($type == 'logout') { ?>
-...
     				<?php echo $loggedInHtml; ?>
     			</div>
     			<?php endif; ?>
     			 <?php
     			 //if($showLogout == 1):
     			 ?>
     			<!-- Hide logout button and replace it with option in menu-->
     			<!-- <div class="bt-button-submit">
     				<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post"
     				 name="logoutForm"  style="margin-left: 30px; margin-top: 10px">
     				 <button name="Submit" class="uk-button uk-button-primary"
     				 style= "height: 40px; width: 120px; text-transform: none ! important; margin-right: 70px; font-family:  Century Gothic!
     			         important; font-size: 15px; background-color:none"  onclick="document.logoutForm.submit();">
     					-->
     					<?php
     					//  echo JText::_('JLOGOUT');
     					 ?>
     					<!--
     					 </button>
     					<input type="hidden" name="option" value="com_users" />
     					<input type="hidden" name="task" value="user.logout" />
     					<input type="hidden" name="return" value="<?php echo $return; ?>" />
     					<?php echo JHtml::_('form.token'); ?>
     				</form>
     			</div>-->
     			<?php
     			//endif;
     			?>
     		</div>
     		<?php }else{ ?>
     		<!-- Form login -->
     		<div id="btl-content-login" class="btl-content-block">
     			<div id="main-block">
     		 <div id="main-block">
     			<?php if(JPluginHelper::isEnabled('authentication', 'openid')) : ?>
     				<?php JHTML::_('script', 'openid.js'); ?>
-...
     				<div id="btl-login-in-process">
     				 </div>
     				<div id= "btl-login-title">
     				 <h3 class="omb_authTitle">
     <?php echo JText::_('LOGIN_TO_YOUR_ACCOUNT') ?>
     				 <p class="omb_authTitle">
     <?php echo JText::_('LOGIN TO YOUR ACCOUNT') ?>
     </h3>
-...
     				<div class="btl-error" id="btl-login-error"></div>
                                      <div class="btl-field" >
     			          <div class="btl-field" >
     				 <div class="btl-label"><?php echo JText::_('Username') ?></div>
     				  <div class="uk-form-large uk-form-width-small">
     				  <input id="btl-input-username" type="text" name="username" />
-...
     			</ul>
     		 </div>
      <div id="btl-social">
     <div class="uk-grid   ">
       <!--edu-orchid-github-g+-social alla ( t-f-l-windows_)-->
     <hr></div>
      <!--  <img src="/images/site_images/or.png" alt="or" style="margin-top: 40px; width:260px;"/> -->
      <div id="socialMsg">
      <?php echo JText::_('Or use Your Social Accounts:'); ?>
      </div>
     <div id="btl-slogin-buttons_group" >
     <ul id='btl-horizontal-list'>
       <li><a href="https://new.openaire.eu/index.php?option=com_sso"   title="Edugain" rel="nofollow"><img src="/images/site_images/Edugain_001.png"  width="45px" /></a></li>
-...
      <div id="register-link">
     	 <?php echo  (JText::_('Don\'t have an account?'));
     	 <?php
     	 // echo  (JText::_('Don\'t have an account?'));
     	 ?>
     	 <div>
     	<a href="index.php?option=com_users&view=registration" title="Register Now!"> Register Now!</a>
     	 <!-- This is an anchor toggling the modal -->
     <!-- <a href="#registration-id" data-uk-modal  title="Register Now!" >Register Now!  </a>
     -->
     <!--
       <a href="index.php?option=com_users&view=registration" title="Register Now!"> Register Now!</a>-->
     		</div>
     				     </div>
     				  <div class="spacer"></div>
     		<!-- if integrated with one component -->
     			<?php }else{ ?>
-...
     	<!--for	<div id="main-block"> -->
     		</div>
     		</div>
     		</div>
     		<?php if($enabledRegistration ){ ?>
     		<?php
     		if($enabledRegistration ){ ?>
     		<div id="btl-content-registration" class="btl-content-block" >
     			<!-- if not integrated any component -->
     			<?php if($integrated_com==''){?>
     		  <p class="omb_authTitle">
     <?php echo JText::_('CREATE AN ACCOUNT') ?>
     </p>
         <div id="register-link">
     	 <?php echo  (JText::_('Don\'t have an account yet ?'));
     	 ?>
     	 <div>
     	  <!-- This is an anchor toggling the modal -->
     <a href="#btl-content-registration-modal" data-uk-modal  title="Register Now!" > Register Now !  </a>
     		</div>
     				     </div>
       <div id="btl-social" >
       <div id="socialMsg">
      Or use Your Social Accounts:
      </div>
     <div id="btl-slogin-buttons_group" >
     <ul id='btl-horizontal-list'>
       <li><a href="https://new.openaire.eu/index.php?option=com_sso"   title="Edugain" rel="nofollow"><img src="/images/site_images/Edugain_001.png"  width="45px" /></a></li>
      <li><a href="/provider/orcid/auth"   title="Orcid" rel="nofollow"><img src="/images/site_images/Orcid_001.png"  width="45px" /></a></li>
     <li><a href="/provider/github/auth"   title="Github" rel="nofollow"><img src="/images/site_images/Github_001.png"  width="45px" /></a></li>
     <li><a href="/provider/google/auth"   title="Google" rel="nofollow"><img src="/images/site_images/Google_001.jpg"  width="45px" /></a></li>
     <li><a href="/provider/twitter/auth"   title="Twitter" rel="nofollow"><img src="/images/site_images/Twitter_001.jpg"  width="45px" /> </a></li>
     <li><a href="/provider/facebook/auth"   title="Facebook" rel="nofollow"> <img src="/images/site_images/Facebook_001.jpg"  width="45px" /> </a></li>
     <li><a href="/provider/linkedin/auth"   title="LinkedIN" rel="nofollow"><img src="/images/site_images/Linkedin_001.jpg"  width="45px" /></a></li>
     <li><a href=" "  title="Windows Live( Available Soon)" rel="nofollow"><img src="/images/site_images/Live_001.png"  width="45px" /></a></li>
     </ul>
     </div>  </div>
     			<!-- if  integrated any component -->
     			<?php }else{ ?>
     				<input type="hidden" name="integrated" value="<?php echo $linkOption?>" value="no" id="btl-integrated"/>
     			<?php }?>
     		</div>
     		<?php } ?>
     	<?php } ?>
     	</div>
     </div>
     <!-- This is the Register  modal -->
     <div id="btl-content-registration-modal" class="uk-modal">
         <div class="uk-modal-dialog">
             <a class="uk-modal-close uk-close"></a>
            <div id="btl-content-registration-modal" class="btl-register-modal">
     			  <div id="btl-success">
     			<p style="font-family: Roboto;font-size: 22px; line-height: 35px;text-transform: uppercase;"> Congratulations! </p>
     			<p>
     			 You have just completed your registration at OpenAire.  </p>
     			<p>Before you can login to the site, you will need to activate your account.
     			 An e-mail will be sent to you with the proper instructions.
     			<div class="uk-alert uk-alert-danger" style=" font-size: 13px;">
     			Important!
     			<br>
     			<p>Please note that this site is currently undergoing  Beta testing.<br>
     			Any new content you create is not guaranteed to be present to the final version
     			of the  site upon release.
     		        </p>
     		        <p>
     		        Thank you for your patience,
     		        <br>
     		        OpenAire Dev Team.
     				</p>
     			</div>
     			<a class="uk-modal-close" style="display: inline; text-decoration: none;">Close This Message</a>
     			    </div>
     				<form name="btl-formregistration" class="btl-formregistration"  autocomplete="off">
     					<div id="btl-register-in-process"></div>
     					<h3><?php echo JText::_('CREATE_AN_ACCOUNT') ?></h3>
     					<div id="btl-success" >     </div>
     					<!--<div class="btl-note"><span><?php echo JText::_("All Fields Are Required"); ?></span></div> -->
       <p class="omb_authTitle">
     <?php echo JText::_('CREATE AN ACCOUNT') ?>
     </p>
     					<div id="btl-registration-error" class="btl-error"></div>
     					 <div class="btl-field">
     		  			 <div class="btl-field">
     						<div class="blt-register-label"><?php echo JText::_( 'Name:' ); ?></div>
     						<div class="uk-form-large uk-form-width-small">
     							<input id="btl-input-name" type="text" name="jform[name]" />
     						</div>
     						<!--<span data-uk-tooltip="{pos:'top-right'}" title="Please Fill In Your Name">   -->
     							<!--<span class="uk-form-help-inline">  -->
     							<div class="uk-form-icon">
        							  <i class="uk-icon-pencil"></i>
         								<input id="btl-input-name" type="text" name="jform[name]">
     							 </div>
     						</div>
     					</div>
     					<div class="clear"></div>
     					<div class="btl-field">
     						<div class="blt-register-label"><?php echo JText::_( 'Username:' ); ?></div>
     						<div class="uk-form-large uk-form-width-small">
     							<input id="btl-input-username1" type="text" name="jform[username]"  />
     							 <div class="uk-form-icon">
        							  <i class="uk-icon-user"></i>
     							<input id="btl-input-username1" type="text" name="jform[username]"/>
     						</div>
     						</div>
     					</div>
     					<div class="clear"></div>
     					<div class="btl-field">
     						<div class="blt-register-label"><?php echo JText::_( 'Password:' ); ?></div>
     						<div class="uk-form-large uk-form-width-small">
     						 <div class="uk-form-icon">
        							  <i class="uk-icon-lock"></i>
     							<input id="btl-input-password1" type="password" name="jform[password1]"  />
     						</div>
     						<!--<div class="btl-note-small"><span><?php echo JText::_("*Must be at least 4 characters long."); ?></span></div>
     						-->
     						</div>
     					</div>
     					<div class="clear"></div>
     					<div class="btl-field">
     						<div class="blt-register-label"><?php echo JText::_( 'Verify Password:' ); ?></div>
     						<div class="uk-form-large uk-form-width-small">
     						<div class="uk-form-large uk-form-width-small">
     						 <div class="uk-form-icon">
        							  <i class="uk-icon-lock"></i>
     							<input id="btl-input-password2" type="password" name="jform[password2]"  />
     							</div>
     						</div>
     					</div>
     					<div class="clear"></div>
-...
     					<div class="btl-field">
     						<div class="blt-register-label"><?php echo JText::_( 'E-mail:' ); ?></div>
     						<div class="uk-form-large uk-form-width-small">
     							<input id="btl-input-email1" type="text" name="jform[email1]" />
     						<div class="uk-form-icon">
        							<i class="uk-icon-at"></i>
     							<input id="btl-input-email1" type="text" name="jform[email1]"  />
     						</div>
     					</div>
     					 <!--  <div class="btl-note-small"><span><?php echo JText::_("*Must be a valid mail address."); ?></span></div>
         -->
      						</div>
     					 </div>
     					<div class="clear"></div>
     					<div class="btl-field">
     						<div class="blt-register-label"><?php echo JText::_( 'Verify E-mail:' ); ?></div>
     						<div class="uk-form-large uk-form-width-small">
     						  <div class="uk-form-icon">
        							  <i class="uk-icon-at"></i>
     							<input id="btl-input-email2" type="text" name="jform[email2]" />
     						</div>
     						</div></div>
     					</div>
     					<div class="clear"></div>
     					   <div class="btl-note"><span><?php echo JText::_("*All Fields Are Required."); ?></span></div>
     					<!-- add captcha-->
     					<?php if($enabledRecaptcha){?>
     					<div class="clear"></div>
     					<div class="btl-field">
     					<div class="btl-field" style="margin-top:25px;">
     						<div class="blt-register-label">
     						<?php echo JText::_( 'Please Verify You Are Human:' ); ?>
     						 </div>
     						<div id="recaptcha" class="recaptcha"   ><?php echo $reCaptcha;?></div>
     				     <div id="recaptcha" class="recaptcha"> <?php echo $reCaptcha;?></div>
     					</div>
     					<div id="btl-registration-captcha-error" class="btl-error-detail"></div>
     					<div class="clear"></div>
     					<!--  end add captcha -->
     					<?php }?>
     					<div  style="margin-left: 25px; margin-top: 20px;">
     					 <button type="submit" class="uk-button uk-button-primary"
     		   style= "height: 40px; width: 120px; text-transform: none ! important; margin-right: 60px; font-family:
     		    Century Gothic! important; font-size: 15px;"
     					 <div  style="margin-left: 25px; margin-top: 20px;">
     					 <button type="submit" class="uk-button uk-button-primary"  id="register-button"
     						 onclick="return registerAjax()" >
     							<?php echo JText::_('JREGISTER');?>
-...
     						<?php echo JHtml::_('form.token');?>
     					</div>
     			</form>
           </div>
      <!-- Start of social Login
      <div id="slogin-buttons_large"  style="margin-top: 10px; margin-left: 35px;">
     <a href="https://new.openaire.eu/index.php?option=com_sso"   title="Edugain" rel="nofollow"><img src="/images/site_images/Edugain_001.png"  width="45px" /></a>
     <a href="/provider/orcid/auth"   title="Orcid" rel="nofollow"><img src="/images/site_images/Orcid_001.png"  width="45px" /></a>
     <a href="/provider/github/auth"   title="Github" rel="nofollow"><img src="/images/site_images/Github_001.png"  width="45px" /></a>
     <a href="/provider/google/auth"   title="Google" rel="nofollow"><img src="/images/site_images/Google_001.jpg"  width="45px" /></a>
     <br>
     <br>
     <a href="/provider/twitter/auth"   title="Twitter" rel="nofollow"><img src="/images/site_images/Twitter_001.jpg"  width="45px" /> </a>
     <a href="/provider/facebook/auth"   title="Facebook" rel="nofollow"> <img src="/images/site_images/Facebook_001.jpg"  width="45px" /> </a>
     <a href="/provider/linkedin/auth"   title="LinkedIN" rel="nofollow"><img src="/images/site_images/Linkedin_001.jpg"  width="45px" /></a>
     <a href=" "   title="Windows Live( Available Soon)" rel="nofollow"><img src="/images/site_images/Live_001.png"  width="45px" /></a>
       </div>
       End of social Login -->
     			<!-- if  integrated any component -->
     			<?php }else{ ?>
     				<input type="hidden" name="integrated" value="<?php echo $linkOption?>" value="no" id="btl-integrated"/>
     			<?php }?>
     		</div>
     		<?php } ?>
     	<?php } ?>
     	</div>
     	<div class="clear"></div>
         </div>
     </div>
      <!-- End of Register Modal-->
     <script type="text/javascript">
     /*<![CDATA[*/

     		window.location.href=BTLJ("#btl-integrated").val();
     		return;
+    	}
     	BTLJ('.btl-panel span').removeClass("active");
     	BTLJ.modal.close();
     	var el = '#btl-panel-registration';
     	var containerWidth = 0;
     	var containerHeight = 0;
-...
     					});
+    				  }
     			   }else{
     				   BTLJ(".btl-formregistration").children("div").hide();
     				   BTLJ("#btl-success").html(html);
     				   BTLJ("#btl-success").show();
     				   setTimeout(function() {window.location.reload();},7000);
     			   }else{
     		        BTLJ("#btl-content-registration-modal.btl-register-modal").children().hide();
     			 //sos sos sos: in we need # before the id to span the correct element
     			 BTLJ("#btl-content-registration-modal.btl-register-modal").children("#btl-success").show();
     			 setTimeout($('#btl-content-registration-modal.btl-register-modal').modal('hide'), 1000);
     			//setTimeout(function() {window.location.reload();},7000);
+    			   }
     		   },
     		   error: function (XMLHttpRequest, textStatus, errorThrown) {
     				alert(textStatus + ': Ajax request failed');
     		  BTLJ("#btl-content-registration-modal.btl-register-modal").children().hide();
     			// alert(textStatus + ': Ajax request failed');
+    		   }
     		});
     		return false;

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 38508

Added by Eri Katsari over 9 years ago