Skip to content

Commit

Permalink
icon mgmt for #2463
Browse files Browse the repository at this point in the history
  • Loading branch information
@julianlam
julianlam committed Jan 1, 2015
1 parent dfe8e8d commit 02e0d46
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 60 deletions.
17 changes: 10 additions & 7 deletions public/src/admin/manage/category.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use strict";
/*global define */
/*global define, app, socket, ajaxify, RELATIVE_PATH, bootbox */

define('admin/manage/category', [
'uploader',
Expand All @@ -11,10 +11,8 @@ define('admin/manage/category', [
Category.init = function() {
var modified_categories = {};

function modified(el, cid) {
if (!cid) {
cid = $(el).parents('form').attr('data-cid');
}
function modified(el) {
var cid = $(el).parents('form').attr('data-cid');

if (cid) {
modified_categories[cid] = modified_categories[cid] || {};
Expand Down Expand Up @@ -115,13 +113,18 @@ define('admin/manage/category', [

uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) {
inputEl.val(imageUrlOnServer);
var previewBox = inputEl.siblings('.category-preview');
var previewBox = inputEl.parent().siblings('.category-preview');
previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')')
.css('background-size', 'cover');
modified(inputEl[0], cid);
modified(inputEl[0]);
});
});

// Icon selection
$('.category-preview').on('click', function(ev) {
iconSelect.init($(this).find('i'), modified);
});

$(function() {


Expand Down
3 changes: 2 additions & 1 deletion public/src/admin/modules/iconSelect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define(function() {
selected = 'fa-doesnt-exist';
}
if (selected) {
$('#icons .fa-icons .fa.' + selected).parent().addClass('selected');
$('#icons .fa-icons .fa.' + selected).addClass('selected');
}

bootbox.confirm('<h2>Select an icon.</h2>' + $('#icons').html(), function(confirm) {
Expand All @@ -29,6 +29,7 @@ define(function() {
el.val(categoryIconClass);
el.attr('value', categoryIconClass);

console.log(el);
onModified(el);
}
});
Expand Down
105 changes: 53 additions & 52 deletions src/views/admin/manage/category.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<div class="row">
<div class="col-md-9">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-folder"></i> Categories</div>
<div class="panel-body">
<div class="pull-right text-right">
<div class="form-group">
<div class="dropdown">
<button type="button" class="btn btn-default" data-toggle="dropdown"><i class="fa fa-cogs"></i> Options</button>
<ul class="dropdown-menu" role="menu">
<li class="permissions"><a href="#"><i class="fa fa-ban"></i> Access Control</a></li>
<hr />

</ul>
<form role="form" class="category" data-cid="{category.cid}">
<div class="col-md-9">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-folder"></i> Categories</div>
<div class="panel-body">
<div class="pull-right text-right">
<div class="form-group">
<div class="dropdown">
<button type="button" class="btn btn-default" data-toggle="dropdown"><i class="fa fa-cogs"></i> Options</button>
<ul class="dropdown-menu" role="menu">
<li class="permissions"><a href="#"><i class="fa fa-ban"></i> Access Control</a></li>
<hr />

</ul>
</div>
</div>
</div>
</div>
<form role="form" class="category" data-cid="{category.cid}">

<h3 data-edit-target="#cid-{category.cid}-name"><span>{category.name}</span> <small><i class="fa fa-edit"></i></small></h3>
<input id="cid-{category.cid}-name" type="text" class="form-control hide" placeholder="Category Name" data-name="name" value="{category.name}" />
<h4 data-edit-target="#cid-{category.cid}-description"><span>{category.description}</span> <small><i class="fa fa-edit"></i></small></h4>
Expand Down Expand Up @@ -78,54 +79,54 @@
</div>
</div>
</fieldset>
</form>
</div>
</div>
</div>

<!-- IMPORT admin/partials/categories/permissions.tpl -->
</div>

<div class="col-md-3 options">
<div class="panel panel-default hidden-sm">
<div class="panel-heading">Preview</div>
<div class="panel-body">
<div class="category-preview" style="
<!-- IF category.backgroundImage -->background-image: url({category.backgroundImage});<!-- ENDIF category.backgroundImage -->
<!-- IF category.bgColor -->background-color: {category.bgColor};<!-- ENDIF category.bgColor -->
color: {category.color};
background-size:cover;
">
<div class="icon">
<i data-name="icon" value="{category.icon}" class="fa {category.icon} fa-2x"></i>
<div class="col-md-3 options">
<div class="panel panel-default hidden-sm">
<div class="panel-heading">Preview</div>
<div class="panel-body">
<div class="category-preview" style="
<!-- IF category.backgroundImage -->background-image: url({category.backgroundImage});<!-- ENDIF category.backgroundImage -->
<!-- IF category.bgColor -->background-color: {category.bgColor};<!-- ENDIF category.bgColor -->
color: {category.color};
background-size:cover;
">
<div class="icon">
<i data-name="icon" value="{category.icon}" class="fa {category.icon} fa-2x"></i>
</div>
</div>
<div class="btn-group-vertical">
<button type="button" data-cid="{category.cid}" data-name="image" data-value="{category.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Upload Image</button>
<!-- IF category.image -->
<button class="btn btn-warning delete-image"><i data-name="icon" value="fa-times" class="fa fa-times"></i> Remove Image</button>
<!-- ENDIF category.image -->
</div>
</div>
<button type="button" data-cid="{category.cid}" data-name="image" data-value="{categories.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Upload Image</button>
<!-- IF categories.image -->
<small class="pointer delete-image"><i data-name="icon" value="fa-times" class="fa fa-times"></i></small>
<!-- ENDIF categories.image -->
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">Categories Control Panel</div>
<div class="panel-body">
<div class="btn-group">
<button class="btn btn-primary save">Save Changes</button>
<button class="btn btn-default revert">Revert</button>
<div class="panel panel-default">
<div class="panel-heading">Categories Control Panel</div>
<div class="panel-body">
<div class="btn-group">
<button class="btn btn-primary save">Save Changes</button>
<button class="btn btn-default revert">Revert</button>
</div>
<hr />
<button class="btn btn-danger purge"><i class="fa fa-eraser"></i> Purge Category</button>
</div>
<hr />
<button class="btn btn-danger purge"><i class="fa fa-eraser"></i> Purge Category</button>
</div>
</div>
</div>

<!-- IMPORT admin/partials/categories/setParent.tpl -->
<div id="icons" style="display:none;">
<div class="icon-container">
<div class="row fa-icons">
<i class="fa fa-doesnt-exist"></i>
<!-- IMPORT admin/partials/fontawesome.tpl -->
<!-- IMPORT admin/partials/categories/setParent.tpl -->
<div id="icons" style="display:none;">
<div class="icon-container">
<div class="row fa-icons">
<i class="fa fa-doesnt-exist"></i>
<!-- IMPORT admin/partials/fontawesome.tpl -->
</div>
</div>
</div>
</div>
</form>
</div>

0 comments on commit 02e0d46

Please sign in to comment.