Skip to content

Commit

Permalink
More style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed Aug 25, 2011
1 parent 6ad3862 commit 32f37af
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 18 deletions.
22 changes: 11 additions & 11 deletions includes/ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1112,13 +1112,13 @@ function deleteTicket() {
* Get addons in the Order Form
*/
function getAddons() {
global $main, $db, $currency;
global $main, $db, $currency, $style;
$billing_id = intval($main->getvar['billing_id']);
$package_id = intval($main->getvar['package_id']);

if(!empty($billing_id) && !empty($package_id)) {

$html = '<div class="page-header"><h2>Package Order</h2></div><table width="100%" >';
$html = '<div class="page-header"><h3>Package</h3></div><table width="100%">';

$sql = "SELECT a.name, amount, bc.name as billing_name FROM `<PRE>packages` a INNER JOIN `<PRE>billing_products` b ON (a.id = b.product_id) INNER JOIN `<PRE>billing_cycles` bc
ON (bc.id = b.billing_id) WHERE a.id = $package_id AND bc.id = $billing_id AND b.type = '".BILLING_TYPE_PACKAGE."' ";
Expand All @@ -1127,14 +1127,14 @@ function getAddons() {
if ($db->num_rows($result) > 0) {
while($data = $db->fetch_array($result)) {
$amount_to_show = $currency->toCurrency($data['amount']);
$html .= "<tr><td width=\"33%\"> {$data['name']}</td>
$html .= "<tr><td width=\"33%\">{$data['name']}</td>
<td width=\"33%\" align=\"right\"><strong>{$data['billing_name']}</strong></td>
<td width=\"33%\" align=\"right\">{$amount_to_show}</td>
<td width=\"33%\" align=\"right\"><div class='price' >{$amount_to_show}</div></td>
</tr>";
$package_billing_info_exist = true;
}
} else {
$html .='No data for this package at the moment';
$html .=' No data for this package at the moment';
}

$html .='</table></fieldset><br />';
Expand All @@ -1145,7 +1145,7 @@ function getAddons() {
if ($db->num_rows($result) > 0) {
$info_exist = false;
$html .= '<fieldset style="width:98%;"><legend><b>Order Add-Ons</b></legend>';
$html .= '<table class="common-table" >';
$html .= '<table class="common-table">';

while($data = $db->fetch_array($result,'ASSOC')) {
$sql = "SELECT a.name, a.mandatory, description, setup_fee, bc.name as billing_name, b.amount FROM `<PRE>addons` a INNER JOIN `<PRE>billing_products` b ON (a.id = b.product_id) INNER JOIN `<PRE>billing_cycles` bc
Expand All @@ -1172,7 +1172,7 @@ function getAddons() {
}
$html .='<input id="addon_ids" '.$checked.' value="'.$data['addon_id'].'" name="addon_ids" type="checkbox"></td>';
$html .='<td width="33%">'.$addon['name'].' '.$addon_mandatory_text.' </td><td align="right">'.$setup_fee.'</td><td align="right"><strong>'.$addon['billing_name'].'</strong></td>';
$html .='<td width="33%" align="right">'.$addon['amount'].'</td></tr>';
$html .='<td width="33%" align="right"><div class="price" >'.$addon['amount'].'</div></td></tr>';
$info_exist = true;
}
}
Expand All @@ -1182,10 +1182,10 @@ function getAddons() {
if ($package_billing_info_exist) {
echo $html;
} else {
echo 'Please select a Billing cycle';
echo $style->returnMessage('Please select another Billing cycle');
}
} else {
echo 'Please select a Billing cycle';
echo $style->returnMessage('Please select another Billing cycle');
}
}

Expand Down Expand Up @@ -1257,7 +1257,7 @@ function getSummary() {
<td></td>
<td>{$data['name']}</td>
<td>{$data['billing_name']} </td>
<td align=\"right\">{$amount_to_show}</td>
<td align=\"right\"><div class='price' >{$amount_to_show}</div></td>
<td></td>
</tr>";
$total = $total + $data['amount'];
Expand All @@ -1269,7 +1269,7 @@ function getSummary() {
<td></td>
<td></td>
<td><b><p class="price" >Total</p></b></td>
<td align="right"><p class="price">'.$total_to_show.'</p></td>
<td align="right"><div class="price">'.$total_to_show.'</div></td>
<td></td>
</tr>';
$html .='</table>';
Expand Down
15 changes: 8 additions & 7 deletions includes/tpl/orderform/orderform.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ function nextstep() {
showhide(step, step + 1)
step = step + 1;
} else {
$("#verify").html("<div class='alert-message info'>You must fill all the fields</div> "+wrong);
$("#verify").html("<div class='alert-message info'>You must fill all the fields</div>");
}
} else {
$("#verify").html("<div class='alert-message info'>You must fill all the fields</div> "+wrong);
$("#verify").html("<div class='alert-message info'>You must fill all the fields</div>");
}
});
Expand All @@ -189,11 +189,11 @@ function nextstep() {
var subdomain = document.getElementById("csub").value;
if (subdomain == '') {
$("#verify").html("<strong>You must fill all the fields</strong> "+wrong);
$("#verify").html("<strong>You must fill all the fields</strong>");
break;
}
if (subdomain_id == '' ) {
$("#verify").html("<strong>You must select a domain</strong> "+wrong);
$("#verify").html("<strong>You must select a domain</strong>");
break;
}
final_domain = subdomain;
Expand All @@ -202,14 +202,14 @@ function nextstep() {
var subdomain_id = '';
var subdomain = '';
if (final_domain == '') {
$("#verify").html("<strong>You must fill a domain name</strong> "+wrong);
$("#verify").html("<strong>You must fill a domain name</strong>");
break;
}
}
$.get("<AJAX>function=checkSubDomainExists&domain="+domain_id+"&package_id="+package_id +"&final_domain="+final_domain+"&subdomain_id="+subdomain_id, function(data) {
if (data == '1') {
$("#verify").html("<strong>Domain already exists</strong> "+wrong);
$("#verify").html("<strong>Domain already exists</strong>");
} else if(data == '0') {
final(step, step + 1);
step = step + 1
Expand Down Expand Up @@ -266,7 +266,7 @@ function nextstep() {
});
});
} else {
$("#verify").html("<strong>Seems that you took a lot of time to decide...</strong> "+wrong);
$("#verify").html("<strong>Seems that you took a lot of time to decide...</strong>");
}
});
break;
Expand Down Expand Up @@ -459,6 +459,7 @@ function checkSubdomain() {
<h3>Already a registered?</h3>
</div>
<a onclick="showLogin();" href="#">_{Log in to your account}</a>
<br /> <br />
<div class="page-header">
<h3>New users</h3>
Expand Down
10 changes: 10 additions & 0 deletions themes/bnpanel/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,14 @@ section {

header, section, footer, article, aside {
display: block;
}

#showaddons {
margin-top:15px;
}

.price {
color: #404040;
font-weight: bold;
font-size: 16px;
}

0 comments on commit 32f37af

Please sign in to comment.