fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 23:03:25 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/new-config-format

Browse source
This commit is contained in:
Kijin Sung 2016-02-06 21:12:10 +09:00
commit 78cb8aea17
73 changed files with 36336 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/document/tpl/category_list.html
View file

@ -5,7 +5,7 @@
<!--%load_js_plugin("ui.tree")-->
<load target="js/document_category.js" />
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<script>
var category_title = "{$lang->category}";
</script>
@ -61,7 +61,7 @@
<div class="x_control-group">
<label class="x_control-label" for="category_color">{$lang->category_color}</label>
<div class="x_controls">
<span class="x_input-append"><input type="text" class="color-indicator" name="category_color" id="category_color" value="" /></span>
<span class="x_input-append"><input type="color" class="rx-spectrum" name="category_color" id="category_color" value="" /></span>
<a href="#categoy_color_help" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</div>

1
modules/document/tpl/js/document_category.js
View file

@ -150,6 +150,7 @@ function clearValue(){
$w.find('input[type="checkbox"]').removeAttr('checked');
$w.find('.lang_code').trigger('reload-multilingual');
$w.find('.color-indicator').trigger('keyup');
$w.find('.rx-spectrum').trigger('keyup');
}
function addNode(node,e){