fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-01 00:02:21 +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

6
modules/admin/tpl/css/admin.css
View file

@ -427,11 +427,13 @@ margin-bottom: 10px;
.x input[type="email"],
.x input[type="url"],
.x input[type="search"],
.x input[type="tel"],
.x input[type="color"] {
.x input[type="tel"] {
height: 16px;
line-height: 16px;
}
.x input[type="color"] {
height: 25px;
}
.x input[type="number"] {
width: 50px;
}

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){

6
modules/editor/components/image_gallery/tpl/popup.html
View file

@ -40,13 +40,13 @@
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->gallery_border_color}</label>
<div class="x_controls">
<input type="color" id="border_color_input" class="color-indicator" size="7" value="#000000" />
<input type="color" id="border_color_input" class="rx-spectrum" size="7" value="#000000" />
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->gallery_bg_color}</label>
<div class="x_controls">
<input type="color" id="bg_color_input" class="color-indicator" size="7" value="#FFFFFF" />
<input type="color" id="bg_color_input" class="rx-spectrum" size="7" value="#FFFFFF" />
</div>
</div>
<div class="x_control-group">
@ -65,5 +65,5 @@
</div>
</form>
</section>
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->

16
modules/layout/tpl/faceoff_layout_menu.html
View file

@ -1,5 +1,5 @@
<!--%load_js_plugin("ui")-->
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<!--%import("js/ui.hotkey.js",optimized=false)-->
<!--%import("js/ui.toolbar.js",optimized=false)-->
<!--%import("js/faceoff.js",optimized=false)-->
@ -218,7 +218,7 @@
<legend>{$lang->layout_manager[38]}</legend>
<span class="inputall">
<input type="text" id="border-width" size="3" title="border-width+px" />
<input type="text" id="border-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-color" size="7" class="rx-spectrum" title="border-color" />
<select id="border-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -237,7 +237,7 @@
<div>
<label for="border-top-width">{$lang->layout_manager[34]} : </label>
<input type="text" id="border-top-width" size="3" title="border-width+px" />
<input type="text" id="border-top-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-top-color" size="7" class="rx-spectrum" title="border-color" />
<select id="border-top-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -254,7 +254,7 @@
<div>
<label for="border-right-width">{$lang->layout_manager[36]} : </label>
<input type="text" id="border-right-width" size="3" title="border-width+px" />
<input type="text" id="border-right-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-right-color" size="7" class="rx-spectrum" title="border-color" />
<select id="border-right-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -271,7 +271,7 @@
<div>
<label for="border-bottom-width">{$lang->layout_manager[37]} : </label>
<input type="text" id="border-bottom-width" size="3" title="border-width+px" />
<input type="text" id="border-bottom-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-bottom-color" size="7" class="rx-spectrum" title="border-color" />
<select id="border-bottom-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -288,7 +288,7 @@
<div>
<label for="border-left-width">{$lang->layout_manager[35]} : </label>
<input type="text" id="border-left-width" size="3" title="border-width+px" />
<input type="text" id="border-left-color" size="7" class="color-indicator" title="border-color" />
<input type="color" id="border-left-color" size="7" class="rx-spectrum" title="border-color" />
<select id="border-left-style" title="border-style">
<option value="none">{$lang->layout_manager[39]}</option>
<option value="hidden">hidden</option>
@ -309,7 +309,7 @@
<div class="visible-more">
<div>
<label for="background-color">{$lang->layout_manager[41]} : </label>
<input type="text" id="background-color" size="7" class="color-indicator" />
<input type="color" id="background-color" size="7" class="rx-spectrum" />
</div>
<div>
<label for="background-image">{$lang->layout_manager[42]} :</label>
@ -335,7 +335,7 @@
</div>
<div>
<label for="color">{$lang->layout_manager[54]} : </label>
<input type="text" id="color" size="7" class="color-indicator" />
<input type="color" id="color" size="7" class="rx-spectrum" />
</div>
</div>
</fieldset>

4
modules/layout/tpl/layout_info_view.html
View file

@ -129,7 +129,7 @@
</block>
<block cond="$var->type == 'colorpicker'">
{@ $use_colorpicker = true; }
<input type="text" class="color-indicator" name="{$name}" id="{$name}" value="{$var->value}" />
<input type="color" class="rx-spectrum" name="{$name}" id="{$name}" value="{$var->value}" />
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</block>
<p class="x_help-block">{$var->description}</p>
@ -172,5 +172,5 @@
</section>
<iframe name="hiddenIframe" src="about:blank" hidden></iframe>
<!--@if($use_colorpicker)-->
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<!--@end-->

17
modules/module/module.controller.php
View file

@ -1242,9 +1242,14 @@ class moduleController extends module
$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
$vars->ext = $ext;
if($vars->filter) $filter = explode(',',$vars->filter);
else $filter = array('jpg','jpeg','gif','png');
if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
if ($vars->filter)
{
$filter = array_map('trim', explode(',',$vars->filter));
if (!in_array($ext, $filter))
{
return new Object(-1, 'msg_error_occured');
}
}
$vars->member_srl = $logged_info->member_srl;
@ -1314,9 +1319,9 @@ class moduleController extends module
$args->module_filebox_srl = $vars->module_filebox_srl;
$args->comment = $vars->comment;
// FIXME $args ??
return executeQuery('module.updateModuleFileBox', $vars);
return executeQuery('module.updateModuleFileBox', $args);
$output->add('save_filename', $save_filename);
return $output;
}

4
modules/module/schemas/module_filebox.xml
View file

@ -4,6 +4,6 @@
<column name="filename" type="varchar" size="250" notnull="notnull" />
<column name="fileextension" type="varchar" size="4" notnull="notnull" index="idx_fileextension" />
<column name="filesize" type="number" size="11" default="0" notnull="notnull" />
<column name="comment" type="varchar" size="250" />
<column name="comment" type="bigtext" />
<column name="regdate" type="date" />
</table>
</table>

2
modules/module/tpl/adminFileBox.html
View file

@ -63,6 +63,8 @@
</object>
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
<img src="{getUrl('')}{$val->filename}" style="max-height:60px" />
<!--@else-->
<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
<!--@end-->
</td>
<td>

2
modules/module/tpl/filebox_list.html
View file

@ -26,6 +26,8 @@
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
<img src="{getUrl('')}{$val->filename}" width="100" height="100" />
<!--@else-->
<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
<!--@end-->
</div>
</td>

2
modules/module/tpl/filebox_list_html.html
View file

@ -17,6 +17,8 @@
</object>
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
<img src="{getUrl('')}{$val->filename}" class="filebox_item" />
<!--@else-->
<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
<!--@end-->
</td>
<td>

4
modules/module/tpl/skin_config.html
View file

@ -117,7 +117,7 @@
<!--// colorpicker-->
<div cond="$val->type == 'colorpicker'">
{@ $use_colorpicker = true; }
<input type="text" class="color-indicator" name="{$val->name}" id="{$val->name}" value="{$val->value}" />
<input type="color" class="rx-spectrum" name="{$val->name}" id="{$val->name}" value="{$val->value}" />
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</div>
<a href="#about_{$val->name}" data-toggle class="x_icon-question-sign" cond="$val->description" style="vertical-align:top;margin-top:5px"|cond="$val->type == 'textarea'">{$lang->help}</a>
@ -132,5 +132,5 @@
</div>
</form>
<!--@if($use_colorpicker)-->
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<!--@end-->

2
modules/widget/tpl/js/widget.js
View file

@ -669,7 +669,7 @@ function doShowWidgetSizeSetup(px, py, obj) {
if(el) {
$el.val(val);
if($el.hasClass('color-indicator')) {
if($el.hasClass('color-indicator') || $el.hasClass('rx-spectrum')) {
if(val != 'transparent') {
val = val.toUpperCase();
$el.css('background', '#' + val);

4
modules/widget/tpl/widget_generate_code.include.html
View file

@ -1,7 +1,7 @@
<load target="../../module/tpl/js/multi_order.js" />
<load target="../../module/tpl/js/module_list.js" />
<load target="../../module/tpl/js/mid.js" />
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<div class="x_control-group">
<label class="x_control-label" for="skin">{$lang->skin}</label>
@ -49,7 +49,7 @@
<input type="text" name="{$id}" />
</block>
<block cond="$var->type == 'color'">
<input type="text" name="{$id}" value="" id="{$id}" class="color-indicator" style="width:178px" />
<input type="color" name="{$id}" value="" id="{$id}" class="rx-spectrum" style="width:178px" />
</block>
<block cond="$var->type == 'textarea'">
<textarea cond="$var->type == 'textarea'" name="{$id}" id="{$id}" rows="8" cols="42"></textarea>

12
modules/widget/tpl/widget_layer.html
View file

@ -62,7 +62,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="7"/>
<input type="color" name="border_top_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
</tr>
<tr>
@ -72,7 +72,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="7"/>
<input type="color" name="border_left_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
<td style="text-align:right">
<input type="number" name="border_right_thick" value="" class="small_input" /> px
@ -80,7 +80,7 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="7"/>
<input type="color" name="border_right_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
</tr>
<tr>
@ -90,12 +90,12 @@
<option value="solid">{$lang->cmd_widget_border_solid}</option>
<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
</select>
<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="7"/>
<input type="color" name="border_bottom_color" value="" class="color_input rx-spectrum" maxlength="7"/>
</td>
</tr>
<tr>
<th>{$lang->cmd_widget_background_color}</th>
<td colspan="2"><input type="text" name="background_color" value="" class="input color-indicator" /></td>
<td colspan="2"><input type="color" name="background_color" value="" class="input rx-spectrum" /></td>
</tr>
<tr>
<th>{$lang->cmd_widget_background_image_url}</th>
@ -129,5 +129,5 @@
.wgs input{margin:0!important;width:60px}
</style>
</section>
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->

4
modules/widget/tpl/widget_style_generate_code_in_page.html
View file

@ -6,7 +6,7 @@
<load target="../../admin/tpl/js/admin.js" />
<load target="../../admin/tpl/js/jquery.tmpl.js" />
<load target="js/generate_code.js" />
<!--%load_js_plugin("ui.colorpicker")-->
<!--%load_js_plugin("spectrum")-->
<script>
jQuery(function(){
getWidgetVars();
@ -72,7 +72,7 @@
<input type="text" name="{$id}" value="" class="lang_code" />
</div>
<input cond="$var->type == 'color'" type="text" name="{$id}" class="color-indicator" />
<input cond="$var->type == 'color'" type="color" name="{$id}" class="rx-spectrum" />
<div cond="$var->type == 'textarea'">
<textarea name="{$id}" rows="8" cols="42" class="lang_code"></textarea>