Skip to content

Commit

Permalink
Version 6.1.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@whmcs-dev-team
whmcs-dev-team committed Sep 10, 2015
1 parent a75a2ba commit 8171353
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 65 deletions.
18 changes: 9 additions & 9 deletions configuressl-stepone.tpl
View file
Expand Up @@ -65,64 +65,64 @@
<div class="form-group">
<label class="col-sm-4 control-label" for="inputLastName">{$LANG.clientarealastname}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="lastname" id="inputLastName" value="{$lastname}" />
<input type="text" class="form-control" name="lastname" id="inputLastName" value="{$lastname}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputOrgName">{$LANG.organizationname}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="orgname" id="inputOrgName" value="{$orgname}" />
<input type="text" class="form-control" name="orgname" id="inputOrgName" value="{$orgname}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputJobTitle">{$LANG.jobtitle}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="jobtitle" id="inputJobTitle" value="{$jobtitle}" />
<input type="text" class="form-control" name="jobtitle" id="inputJobTitle" value="{$jobtitle}" />
<p class="help-block">{$LANG.jobtitlereqforcompany}</p>
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputEmail">{$LANG.clientareaemail}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="email" id="inputEmail" value="{$email}" />
<input type="text" class="form-control" name="email" id="inputEmail" value="{$email}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputAddress1">{$LANG.clientareaaddress1}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="address1" id="inputAddress1" value="{$address1}" />
<input type="text" class="form-control" name="address1" id="inputAddress1" value="{$address1}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputAddress2">{$LANG.clientareaaddress2}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="address2" id="inputAddress2" value="{$address2}" />
<input type="text" class="form-control" name="address2" id="inputAddress2" value="{$address2}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputCity">{$LANG.clientareacity}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="city" id="inputCity" value="{$city}" />
<input type="text" class="form-control" name="city" id="inputCity" value="{$city}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputState">{$LANG.clientareastate}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="state" id="inputState" value="{$state}" />
<input type="text" class="form-control" name="state" id="inputState" value="{$state}" />
</div>
</div>

<div class="form-group">
<label class="col-sm-4 control-label" for="inputPostcode">{$LANG.clientareapostcode}</label>
<div class="col-sm-8">
<input type="text" class="form-control"name="postcode" id="inputPostcode" value="{$postcode}" />
<input type="text" class="form-control" name="postcode" id="inputPostcode" value="{$postcode}" />
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion css/overrides.css
View file
Expand Up @@ -7,7 +7,7 @@
* @cssdoc version 1.0-pre
* @package WHMCS
* @author WHMCS Limited <development@whmcs.com>
* @copyright Copyright (c) WHMCS Limited 2005-2014
* @copyright Copyright (c) WHMCS Limited 2005-2015
* @license http://www.whmcs.com/license/
* @link http://www.whmcs.com/
*/
Expand Down
2 changes: 1 addition & 1 deletion css/quote.css
View file
Expand Up @@ -7,7 +7,7 @@
* @cssdoc version 1.0-pre
* @package WHMCS
* @author WHMCS Limited <development@whmcs.com>
* @copyright Copyright (c) WHMCS Limited 2005-2014
* @copyright Copyright (c) WHMCS Limited 2005-2015
* @license http://www.whmcs.com/license/
* @link http://www.whmcs.com/
*/
Expand Down
4 changes: 2 additions & 2 deletions css/styles.css
View file
Expand Up @@ -631,7 +631,7 @@ div.tweet span {

/* ===== Domain Checker ===== */

div.domainresults div {
div.domainresults div:not(.btn-group) {
margin: 0;
padding: 10px 25px;
background-color: #ddd;
Expand All @@ -640,7 +640,7 @@ div.domainresults div {
border-radius: 6px 6px 0 0;
}

div.domainresults div span {
div.domainresults div:not(.btn-group) span {
padding-left: 20px;
font-size: 14px;
color: #888;
Expand Down
112 changes: 98 additions & 14 deletions domainchecker-results.tpl
View file
Expand Up @@ -35,10 +35,38 @@
{$searchResults.shortestPeriod.register}
</td>
<td class="text-center">
<button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-shopping-cart"></span>
{$LANG.addtocart}
</button>
{if count($searchResults.pricing) == 1}
<button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-shopping-cart"></span>
{$LANG.addtocart}
</button>
{else}
<div class="btn-group">
<button type="button" class="btn btn-primary btn-sm" onclick="addToCart(this, false, 'register')">
<b class="glyphicon glyphicon-shopping-cart"></b>
{$LANG.addtocart}
</button>
<button type="button" class="btn btn-primary btn-sm dropdown-toggle additional-options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<b class="caret"></b>
<span class="sr-only">
{lang key="domainChecker.additionalPricingOptions" domain=$searchResults.domainName}
</span>
</button>
<ul class="dropdown-menu" role="menu">
{foreach $searchResults.pricing as $years => $price}
{if $price@iteration eq 1}
{* Don't output the first as this is default *}
{continue}
{/if}
<li>
<a onclick="addToCart(this, false, 'register', {$years});return false;">
{$years} {$LANG.orderyears} @ {$price.register}
</a>
</li>
{/foreach}
</ul>
</div>
{/if}
</td>
</tr>
{/if}
Expand Down Expand Up @@ -71,12 +99,40 @@
{$result.shortestPeriod.transfer}
{/if}
</td>
<td class="text-center">
<td class="text-right">
{if ($searchingFor == 'register' && $result.isAvailable)}
<button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-shopping-cart"></span>
{$LANG.addtocart}
</button>
{if count($result.pricing) == 1}
<button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-shopping-cart"></span>
{$LANG.addtocart}
</button>
{else}
<div class="btn-group">
<button type="button" class="btn btn-primary btn-sm" onclick="addToCart(this, false, 'register')">
<b class="glyphicon glyphicon-shopping-cart"></b>
{$LANG.addtocart}
</button>
<button type="button" class="btn btn-primary btn-sm dropdown-toggle additional-options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<b class="caret"></b>
<span class="sr-only">
{lang key="domainChecker.additionalPricingOptions" domain=$result.domainName}
</span>
</button>
<ul class="dropdown-menu" role="menu">
{foreach $result.pricing as $years => $price}
{if $price@iteration eq 1}
{* Don't output the first as this is default *}
{continue}
{/if}
<li>
<a onclick="addToCart(this, false, 'register', {$years});return false;">
{$years} {$LANG.orderyears} @ {$price.register}
</a>
</li>
{/foreach}
</ul>
</div>
{/if}
{elseif ($searchingFor == 'transfer' && $result.isRegistered)}
<button type="button" onclick="addToCart(this, false, 'transfer')" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-shopping-cart"></span>
Expand Down Expand Up @@ -111,11 +167,39 @@
<td class="text-center">
{$result.shortestPeriod.register}
</td>
<td class="text-center">
<button type="button" class="btn btn-default btn-sm" onclick="addToCart(this, true, 'register')">
<span class="glyphicon glyphicon-shopping-cart"></span>
{$LANG.addtocart}
</button>
<td class="text-right">
{if count($result.pricing) == 1}
<button type="button" onclick="addToCart(this, false, 'register')" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-shopping-cart"></span>
{$LANG.addtocart}
</button>
{else}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm" onclick="addToCart(this, false, 'register')">
<b class="glyphicon glyphicon-shopping-cart"></b>
{$LANG.addtocart}
</button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle additional-options" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<b class="caret"></b>
<span class="sr-only">
{lang key="domainChecker.additionalPricingOptions" domain=$result.domainName}
</span>
</button>
<ul class="dropdown-menu" role="menu">
{foreach $result.pricing as $years => $price}
{if $price@iteration eq 1}
{* Don't output the first as this is default *}
{continue}
{/if}
<li>
<a onclick="addToCart(this, false, 'register', {$years});return false;">
{$years} {$LANG.orderyears} @ {$price.register}
</a>
</li>
{/foreach}
</ul>
</div>
{/if}
</td>
</tr>
{/foreach}
Expand Down
4 changes: 2 additions & 2 deletions header.tpl
View file
Expand Up @@ -49,7 +49,7 @@
<div class="pull-right nav">
<a href="#" class="quick-nav" data-toggle="popover" id="loginOrRegister" data-placement="bottom"><i class="fa fa-user"></i> {$LANG.login}</a>
<div id="loginOrRegisterContent" class="hidden">
<form action="dologin.php" method="post" role="form">
<form action="{$systemsslurl}dologin.php" method="post" role="form">
<div class="form-group">
<input type="email" name="username" class="form-control" placeholder="{$LANG.clientareaemail}" required />
</div>
Expand Down Expand Up @@ -228,6 +228,6 @@
{/if}
<!-- Container for main page display content -->
<div class="{if $primarySidebar->hasChildren() || $secondarySidebar->hasChildren()}col-md-9 pull-md-right{else}col-xs-12{/if} main-content">
{if !$primarySidebar->hasChildren() && !$showingLoginPage && $templatefile != 'homepage'}
{if !$primarySidebar->hasChildren() && !$showingLoginPage && !$inShoppingCart && $templatefile != 'homepage'}
{include file="$template/includes/pageheader.tpl" title=$displayTitle desc=$tagline showbreadcrumb=true}
{/if}
16 changes: 14 additions & 2 deletions js/domainchecker.js
View file
Expand Up @@ -109,18 +109,30 @@ jQuery(document).ready(function() {
});
});

function addToCart(clickedBtn, performAvailabilityCheck, orderType) {
function addToCart(clickedBtn, performAvailabilityCheck, orderType, years) {

var selectedDomain = jQuery(clickedBtn).closest('tr')
.find('td:first strong')
.html();
var appendYears = '';
if (typeof years != "undefined") {
clickedBtn = jQuery(clickedBtn).closest('div')
.find('button:first');
appendYears = '&reg_period=' + years;
}

var cartDropDown = jQuery(clickedBtn).closest('div')
.find('button.additional-options');
if (typeof cartDropDown != "undefined") {
jQuery(cartDropDown).attr('disabled', 'disabled');
}

jQuery(clickedBtn).attr('disabled', 'disabled')
.html('<span class="glyphicon glyphicon-shopping-cart"></span> ' + langAdding + '...');

jQuery.post(
"domainchecker.php",
"addtocart=1&check=" + performAvailabilityCheck + "&token=" + csrfToken + "&domain=" + selectedDomain + "&orderType=" + orderType,
"addtocart=1&check=" + performAvailabilityCheck + "&token=" + csrfToken + "&domain=" + selectedDomain + "&orderType=" + orderType + appendYears,
function(data) {
if (data == 1) {
jQuery("#cartItemCount").html(((jQuery("#cartItemCount").html() * 1) + 1));
Expand Down

0 comments on commit 8171353

Please sign in to comment.