Skip to content

Commit

Permalink
latest
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin olson authored and acidjazz committed Feb 24, 2012
1 parent bc20204 commit 12e733e
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 13 deletions.
12 changes: 12 additions & 0 deletions ajx/details.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,22 @@
}

$detail = new detail($data['name'], $data['type'], $data['value']);
$detail->site = $data['site'];
$detail->save();

break;

case 'update' :

$data = json_decode($_REQUEST['data'], true);
$detail = new detail($data['name'], $data['type'], $data['value']);
$detail->site = $data['site'];
$detail->save();

break;



}

}
Expand Down
6 changes: 3 additions & 3 deletions config.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?

define('G_PATH', '/var/www/tribal/');
define('LIB_PATHS', '/var/www/tribal/lib/,/var/www/tribal/klib/');
define('G_URL', 'http://tribal.ssugar.com/');
define('G_PATH', '/var/www/admin/');
define('LIB_PATHS', '/var/www/admin/lib/,/var/www/admin/klib/');
define('G_URL', 'http://admin.256.sh/');

/* kdebug */
define('KDEBUG', true);
Expand Down
6 changes: 5 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,13 @@ body {
width: 430px;
}

.formmason {
margin: auto;
}

.formsmall {

width: 270px;
width: 370px;
margin-left: 4px;

-webkit-transition-duration: 0.7s;
Expand Down
3 changes: 0 additions & 3 deletions index.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?


require_once 'config.php';
require_once 'tpl/header.php';



$site = 'hiddenvalley';

if (isset($_REQUEST['site']) && in_array($_REQUEST['site'], array('hiddenvalley','grilling')) ) {
Expand Down
36 changes: 31 additions & 5 deletions jst/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,15 @@ var admin = {
case 'grilling':
case 'hiddenvalley':

$('.site_button').removeClass('site_button_active');
$(this).parent('.site_buttons').children('.site_button').removeClass('site_button_active');
//$('.site_button').removeClass('site_button_active');

$(this).addClass('site_button_active');

if ($(this).data('detail')) {
details.update($(this));
}

break;

case 'details' :
Expand Down Expand Up @@ -205,8 +212,10 @@ var admin = {

$('.status_body').html(message);

admin.center(s, {top: 50});
s.transition({opacity: 1}, 500, 'in');
if (s.css('opacity') == 0) {
admin.center(s, {top: 50});
s.transition({opacity: 1}, 500, 'in');
}

if (p.fadeOut) {
setTimeout(function() { s.transition({opacity: 0}, 500, 'out'); }, p.fadeOut);
Expand Down Expand Up @@ -286,7 +295,8 @@ var details = {

$('.formmason').masonry({
itemSelector: '.formsmall',
columnWidth: 320
isFitWidth: true,
columnWidth: 420
});

$('#value').keyup(function(e) {
Expand All @@ -308,7 +318,8 @@ var details = {
var details = {
name: $('#name').val(),
type: $('#type').val(),
value: $('#value').val()
value: $('#value').val(),
site: $('#site').val()
};

$.get(g.G_URL + 'ajx/details.php', {action: 'add', data: JSON.stringify(details)}, function(response) {
Expand All @@ -322,6 +333,21 @@ var details = {

}, 'json');

},

update: function(obj) {

var details = obj.data('data');
details.site = obj.data('value');

$.get(g.G_URL + 'ajx/details.php', {action: 'update', data: JSON.stringify(details)}, function(response) {
if (response.error != false) {
admin.status(response.error, {type: 'error'});
} else {
admin.status('Detail updated');
}
}, 'json');

}

}
Expand Down
35 changes: 35 additions & 0 deletions tpl/details.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,24 @@
<label for="name">Add a Detail</label>

<div class="input">

<input type="text" name="name" id="name" value="" />

<select name="type" id="type">
<option value="choice">choice</option>
<option value="string">string</option>
<option value="none">none</option>
</select>


<select name="site" id="site">
<option value="both">both</option>
<option value="grilling">grilling.com</option>
<option value="hiddenvalley">hiddenvalley.com</option>
</select>

<input type="text" name="value" id="value" value="" data-cmd="details.add();" />

<div class="button" data-action="add_detail">Add</div>
</div>
</div>
Expand All @@ -31,6 +42,7 @@
<table class="listing sublisting" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>value</th>
<th>site</th>
</tr>
<?foreach ($detail as $d): ?>
<tr>
Expand All @@ -42,6 +54,29 @@ class="delete_button"
<div class="sprite sprite_delete"></div></div>

<?=$d['value']?></td>

<td>
<div class="site_buttons site_buttons_detailsite">
<div
class="site_button <?=($d['site'] == 'both') ? 'site_button_active' : ''?>"
data-data='<?=json_encode($d)?>'
data-value="both"
data-detail="1"
>b</div>
<div
class="site_button <?=($d['site'] == 'grilling') ? 'site_button_active' : ''?>"
data-data='<?=json_encode($d)?>'
data-value="grilling"
data-detail="1"
>g</div>
<div
class="site_button <?=($d['site'] == 'hiddenvalley') ? 'site_button_active' : ''?>"
data-data='<?=json_encode($d)?>'
data-value="hiddenvalley"
data-detail="1"
>hv</div>
</div>
</td>
</tr>
<?endforeach?>
</table>
Expand Down
2 changes: 2 additions & 0 deletions tpl/listing_detail.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<tr>
<th>name</th>
<th>value</th>
<th>site</th>
</tr>

<?foreach ($recipeDetail as $dr):?>
Expand All @@ -15,6 +16,7 @@ class="delete_button"
data-value='<?=json_encode(array('recipe_id' => $dr->recipe_id, 'type' => $dr->type, 'value' => $dr->value), JSON_HEX_APOS)?>' >
<div class="sprite sprite_delete"></div></div>
<?=$dr->value?></td>
<td><?=$dr->site?></td>
</tr>
<?endforeach?>

Expand Down
2 changes: 1 addition & 1 deletion tpl/modify.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<?if ($value[0]['type'] == 'choice'): ?>
<select name="detail_value" id="detail_value" class="detail_value detail_value_<?=str_replace(' ', '_', $name)?>">
<?foreach ($value as $val):?>
<option value="<?=$val['value']?>"><?=$val['value']?></option>
<option value="<?=$val['value']?>"><?=$val['value']?> (<?=$val['site']?>)</option>
<?endforeach?>
</select>

Expand Down

0 comments on commit 12e733e

Please sign in to comment.