Widget module UI fixed. Bootstrap compatibility.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12619 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-01-30 09:22:26 +00:00
parent 260d52fc9f
commit 05a9d6ee13
15 changed files with 276 additions and 300 deletions

View file

@ -2,7 +2,7 @@
/* Reset */ /* Reset */
html,body{min-height:100%} html,body{min-height:100%}
body{-webkit-text-size-adjust:none} body{-webkit-text-size-adjust:none}
body>.x:first-child{min-width:300px;max-width:1240px;margin:8px} body>.x:first-child{min-width:300px;max-width:1240px}
body>.x, body>.x,
.x label, .x label,
.x table, .x table,
@ -103,15 +103,18 @@ body>.x,
.x .x_input-prepend a.x_add-on{height:16px;line-height:16px} .x .x_input-prepend a.x_add-on{height:16px;line-height:16px}
.x .x_input-append button.x_add-on, .x .x_input-append button.x_add-on,
.x .x_input-prepend button.x_add-on{height:24px;line-height:16px} .x .x_input-prepend button.x_add-on{height:24px;line-height:16px}
.x .x_modal-header{padding:10px 15px;border-bottom:1px solid #aaa;background-color:#333;border-radius:5px 5px 0 0;background-image:-webkit-linear-gradient(top, #666, #333 50%, #000 50%, #333 100%);background-image:-moz-linear-gradient(top, #666, #333 50%, #000 50%, #333 100%);background-image:-o-linear-gradient(top, #666, #333 50%, #000 50%, #333 100%);background-image:linear-gradient(top, #666, #333 50%, #000 50%, #333 100%)}
.x .x_modal-header>h1,
.x .x_modal-header>h2,
.x .x_modal-header>h3{font-size:16px;line-height:30px;margin:0;color:#fff;text-shadow:0 -1px 0 #000}
.x .x_modal-body{overflow-y:visible;max-height:none}
.x_modal, .x_modal,
.x_modal-backdrop{display:none} .x_modal-backdrop{display:none}
.x_modal-backdrop{opacity:.6;filter:alpha(opacity=60)} .x_modal-backdrop{opacity:.6;filter:alpha(opacity=60)}
.x_modal{padding:0;width:90%;margin:0 0 0 -45%;max-width:none;border-radius:6px;background-color:#333;background-image:-webkit-linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);background-image:-moz-linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);background-image:-o-linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);background-image:linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);} .x_modal{padding:0;width:90%;margin:0 0 0 -45%;max-width:none;border-radius:6px}
.x_modal>form{margin:0 !important} .x_modal>form{margin:0 !important}
.x_modal>.x_close{position:absolute;top:10px;right:5px;font-size:21px;color:#fff} .x_modal>.x_close{position:absolute;top:8px;right:10px;font-size:21px;color:#fff}
.x_modal .x_modal-header{padding:15px;border-bottom:1px solid #aaa} .x_modal .x_modal-body{background:#fff;min-height:50px;overflow-y:auto;max-height:400px}
.x_modal .x_modal-header>h3{color:#fff;text-shadow:0 -1px 0 #000;font-size:16px}
.x_modal .x_modal-body{background:#fff;min-height:50px}
.x_modal-body:after{content:"";display:block;clear:both} .x_modal-body:after{content:"";display:block;clear:both}
.x .x_control-group{padding-top:8px;border-top:1px dotted #ddd;clear:both} .x .x_control-group{padding-top:8px;border-top:1px dotted #ddd;clear:both}
.x .x_control-group:before{content:"";display:block;clear:both} .x .x_control-group:before{content:"";display:block;clear:both}

File diff suppressed because one or more lines are too long

View file

@ -1,57 +1,51 @@
<block cond="$use_filebox"> <!--%load_js_plugin("filebox")-->
<!--%load_js_plugin("filebox")--> <div class="x_modal" id="modalFilebox" cond="$use_filebox">
<style> <div class="x_modal-header">
.filebox_item{max-height:200px;max-width:200px} <h1>File Box</h1>
</style>
<div class="x_modal" id="modalFilebox" style="display:none">
<div class="x_modal-header">
<h3>FileBox</h3>
</div>
<div class="x_modal-body">
<section class="section">
<h4>{$lang->upload_file}</h4>
<form id="new_filebox_upload" action="./" class="x_form-horizontal" method="post" enctype="multipart/form-data">
<input type="hidden" name="module" value="module" />
<input type="hidden" name="act" value="procModuleFileBoxAdd" />
<input type="hidden" name="vid" value="{$vid}" />
<input type="hidden" name="filter" value="{$filter}" />
<input type="hidden" name="input" value="{$input}" />
<input type="hidden" name="ajax" value="true" />
<div class="x_control-group __attribute" data-count="1">
<label for="attribute_name1" class="x_control-label __attribute_name_label">{$lang->attribute_name}</label>
<div class="x_controls">
<input type="text" name="attribute_name[]" id="attribute_name1" class="__attribute_name" />
<label for="attribute_value1" class="x_inline __attribute_value_label">{$lang->attribute_value} <input type="text" name="attribute_value[]" id="attribute_value1" class="__attribute_value" /></label>
<button type="button" class="x_btn __addBtn" onclick="addRow('fileUp');">{$lang->cmd_add}</button>
<button type="button" class="x_btn __deleteBtn" onclick="clearRow(this);">{$lang->cmd_delete}</button>
</div>
</div>
<div class="x_control-group">
<label for="file" class="x_control-label">{$lang->file}</label>
<div class="x_controls">
<input type="file" name="addfile" id="file" />
</div>
</div>
<div class="btnArea">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
</form>
</section>
<section>
<h4>List</h4>
<div class="filebox_list"></div>
</section>
</div>
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#modalFileBox">{$lang->cmd_close}</button>
</div>
</div> </div>
<script> <div class="x_modal-body">
xe.lang.cmd_delete = '{$lang->cmd_delete}'; <h2>{$lang->upload_file}</h2>
</script> <form id="new_filebox_upload" action="./" class="x_form-horizontal" method="post" enctype="multipart/form-data">
</block> <input type="hidden" name="module" value="module" />
<input type="hidden" name="act" value="procModuleFileBoxAdd" />
<input type="hidden" name="vid" value="{$vid}" />
<input type="hidden" name="filter" value="{$filter}" />
<input type="hidden" name="input" value="{$input}" />
<input type="hidden" name="ajax" value="true" />
<div class="x_control-group __attribute" data-count="1">
<label for="attribute_name1" class="x_control-label __attribute_name_label">{$lang->attribute_name}</label>
<div class="x_controls">
<input type="text" name="attribute_name[]" id="attribute_name1" class="__attribute_name" />
<label for="attribute_value1" class="x_inline __attribute_value_label">{$lang->attribute_value}
<input type="text" name="attribute_value[]" id="attribute_value1" class="__attribute_value" />
</label>
<span class="x_btn-group">
<button type="button" class="x_btn __addBtn" onclick="addRow('fileUp');">{$lang->cmd_add}</button>
<button type="button" class="x_btn __deleteBtn" onclick="clearRow(this);">{$lang->cmd_delete}</button>
</span>
</div>
</div>
<div class="x_control-group">
<label for="file" class="x_control-label">{$lang->file}</label>
<div class="x_controls">
<input type="file" name="addfile" id="file" />
</div>
</div>
<div class="btnArea">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
</form>
<h2>{$lang->cmd_list}</h2>
<div class="filebox_list"></div>
<style scoped>
.filebox_item{max-height:80px;max-width:200px}
</style>
</div>
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#modalFileBox">{$lang->cmd_close}</button>
</div>
</div>
<script>
xe.lang.cmd_delete = '{$lang->cmd_delete}';
</script>

View file

@ -1,33 +1,24 @@
<load target="js/widget.js" usecdn="true" /> <load target="js/widget.js" usecdn="true" />
<load target="css/widget.css" usecdn="true" /> <load target="css/widget.css" usecdn="true" />
<form action="./" method="get" onsubmit="return addContentWidget(this); return false;" id="content_fo">
<div class="x" style="padding: 0 10px;"> <input type="hidden" name="content" value="{$oDocument->getContentText()}" />
<input type="hidden" name="mid" value="{$module_info->mid}" />
<h2 class="h2">{$lang->cmd_content_insert}</h2> <input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
<form action="./" method="get" onsubmit="return addContentWidget(this); return false;" id="content_fo"> <input type="hidden" name="style" value="float:left;padding:none;margin:none;width:100%;" />
<input type="hidden" name="content" value="{$oDocument->getContentText()}" /> <input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="mid" value="{$module_info->mid}" /> <input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="module_srl" value="{$module_srl}" /> <input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="document_srl" value="{$document_srl}" /> <input type="hidden" name="widget_padding_bottom" value="" />
<input type="hidden" name="style" value="float:left;padding:none;margin:none;width:100%;" /> <div class="x_modal-header">
<input type="hidden" name="widget_padding_left" value="" /> <h1>{$lang->cmd_content_insert}</h1>
<input type="hidden" name="widget_padding_right" value="" /> </div>
<input type="hidden" name="widget_padding_top" value="" /> <div class="x_modal-body">
<input type="hidden" name="widget_padding_bottom" value="" />
<div class="pageAddContent"></div> <div class="pageAddContent"></div>
<div class="editor">{$editor}</div>
<div class="editor"> <script>xAddEventListener(window, 'load', doSyncPageContent);</script>
{$editor} </div>
</div> <div class="x_modal-footer">
<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-inverse" />
<script> </div>
xAddEventListener(window, 'load', doSyncPageContent); </form>
</script>
<div class="btnArea">
<input class="btn" type="submit" value="{$lang->cmd_save}" class="editor_button" />
</div>
</form>
</div>

View file

@ -26,7 +26,7 @@
.widgetButtons .widgetBoxCopy{background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000} .widgetButtons .widgetBoxCopy{background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
.widgetButtons .widgetBoxSize{background:transparent url("../images/widget_size.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000} .widgetButtons .widgetBoxSize{background:transparent url("../images/widget_size.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
.widgetButtons .widgetBoxRemove{background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000} .widgetButtons .widgetBoxRemove{background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:1999;position:absolute} /*#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:1999;position:absolute}
#pageSizeLayer table{border:0;width:100%;table-layout:fixed} #pageSizeLayer table{border:0;width:100%;table-layout:fixed}
#pageSizeLayer table th{padding:4px 0 4px 0;background-color:#DEDEDE;text-align:center;color:#888} #pageSizeLayer table th{padding:4px 0 4px 0;background-color:#DEDEDE;text-align:center;color:#888}
#pageSizeLayer table th.line {border-top:1px dotted #eee} #pageSizeLayer table th.line {border-top:1px dotted #eee}
@ -38,7 +38,7 @@
#pageSizeLayer .full_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:90%} #pageSizeLayer .full_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:90%}
#pageSizeLayer .small_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:20px} #pageSizeLayer .small_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:20px}
#pageSizeLayer .color_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:44px} #pageSizeLayer .color_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:44px}
#pageSizeLayer .submit{width:90%;border:1px solid #DEDEDE;background-color:#fff} #pageSizeLayer .submit{width:90%;border:1px solid #DEDEDE;background-color:#fff}*/
.help{padding:5px 0;background-color:#EFEFEF;border-top:1px solid #ccc} .help{padding:5px 0;background-color:#EFEFEF;border-top:1px solid #ccc}
ul.midCommand{float:left;margin:0 0 0 10px;;padding:0;*zoom:1} ul.midCommand{float:left;margin:0 0 0 10px;;padding:0;*zoom:1}
ul.midCommand li{display:block;margin-bottom:5px;list-style:none} ul.midCommand li{display:block;margin-bottom:5px;list-style:none}

View file

@ -2,9 +2,11 @@
<h1> <h1>
{$lang->installed_widgets} <a class="x_icon-question-sign" href="./help/index.html#UMAN_advanced_installed_widget" target="_blank">{$lang->help}</a> {$lang->installed_widgets} <a class="x_icon-question-sign" href="./help/index.html#UMAN_advanced_installed_widget" target="_blank">{$lang->help}</a>
<span class="path" cond="$widget_info"> <span class="path" cond="$widget_info">
&gt; {$widget_info->title} &gt; {$widget_info->title} <a cond="$widget_info" href="#widgetInfo" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
</span>
<span class="path" cond="$widget_info">
&gt; {$lang->cmd_generate_code} <a href="#codeHelp" class="x_icon-question-sign" data-toggle style="vertical-align:middle">{$lang->help}</a>
</span> </span>
<a cond="$widget_info" href="#widgetInfo" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
</h1> </h1>
</div> </div>
<div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}"> <div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}">

View file

@ -1,5 +1,5 @@
<load target="../../admin/tpl/css/admin.css" usecdn="true" /> <load target="../../admin/tpl/css/admin.css" usecdn="true" />
<h1 class="h1">{$skin_info->title}</h1> <h1>{$skin_info->title}</h1>
<table class="x_table x_table-striped x_table-hover"> <table class="x_table x_table-striped x_table-hover">
<col width="100" /> <col width="100" />
<col /> <col />
@ -45,7 +45,7 @@
</table> </table>
<!--@if($skin_info->history)--> <!--@if($skin_info->history)-->
<h1 class="h1">{$lang->skin_history}</h1> <h1>{$lang->skin_history}</h1>
<table class="x_table x_table-striped x_table-hover"> <table class="x_table x_table-striped x_table-hover">
<col width="100" /> <col width="100" />
<col /> <col />

View file

@ -1,8 +1,8 @@
<load target="css/widget.css" usecdn="true" /> <load target="css/widget.css" usecdn="true" />
<load target="../../admin/tpl/css/admin.css" usecdn="true" /> <load target="../../admin/tpl/css/admin.css" usecdn="true" />
<h1 class="h1">{$lang->widget}</h1> <h1>{$lang->widget}</h1>
<h2 class="h2">{$lang->widget_maker}</h2> <h2>{$lang->widget_maker}</h2>
<table class="x_table x_table-striped x_table-hover"> <table class="x_table x_table-striped x_table-hover">
<tr> <tr>
<th scope="row"><div>{$lang->title}</div></th> <th scope="row"><div>{$lang->title}</div></th>
@ -44,7 +44,7 @@
</table> </table>
<!--@if($widget_info->history)--> <!--@if($widget_info->history)-->
<h1 class="h1">{$lang->widget_history}</h1> <h1>{$lang->widget_history}</h1>
<table class="x_table x_table-striped x_table-hover"> <table class="x_table x_table-striped x_table-hover">
<!--@foreach($widget_info->history as $history)--> <!--@foreach($widget_info->history as $history)-->

View file

@ -1,14 +1,11 @@
<include cond="$in_admin" target="header.html" /> <include cond="$in_admin" target="header.html" />
<load target="js/generate_code.js" usecdn="true" /> <load target="js/generate_code.js" usecdn="true" />
<div class="x_alert x_alert-info" hidden id="widgetInfo"> <div class="x_alert x_alert-info" id="widgetInfo" hidden><p>{$widget_info->description}</p></div>
<p>{$widget_info->description}</p> <div class="x_alert x_alert-info" id="codeHelp" hidden><p>{$lang->about_widget_code}</p></div>
</div> <form id="widget_code_form" class="x_form-horizontal" action="./" method="post">
<form id="widget_code_form" class="x_form-horizontal section" action="./" method="post">
<input type="hidden" name="module" value="widget" /> <input type="hidden" name="module" value="widget" />
<input type="hidden" name="act" value="procWidgetGenerateCode" /> <input type="hidden" name="act" value="procWidgetGenerateCode" />
<input type="hidden" name="selected_widget" value="{$widget_info->widget}" /> <input type="hidden" name="selected_widget" value="{$widget_info->widget}" />
<h1>{$lang->cmd_generate_code} <a href="#codeHelp" class="x_icon-question-sign" data-toggle style="vertical-align:middle">{$lang->help}</a></h1>
<div class="x_alert x_alert-info" id="codeHelp" hidden><p>{$lang->about_widget_code}</p></div>
<include target="widget_generate_code.include.html" /> <include target="widget_generate_code.include.html" />
<div class="x_clearfix btnArea"> <div class="x_clearfix btnArea">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" class="x_btn x_pull-left">{$lang->cmd_list}</a> <a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" class="x_btn x_pull-left">{$lang->cmd_list}</a>

View file

@ -2,12 +2,12 @@
<load target="../../module/tpl/js/module_list.js" usecdn="true" /> <load target="../../module/tpl/js/module_list.js" usecdn="true" />
<load target="../../module/tpl/js/mid.js" usecdn="true" /> <load target="../../module/tpl/js/mid.js" usecdn="true" />
<!--%load_js_plugin("ui.colorpicker")--> <!--%load_js_plugin("ui.colorpicker")-->
<div class="x_control-group" style="border-top:0;padding-top:0"> <div class="x_control-group">
<label class="x_control-label" for="skin">{$lang->skin}</label> <label class="x_control-label" for="skin">{$lang->skin}</label>
<div class="x_controls"> <div class="x_controls">
<select name="skin" id="skin"> <select name="skin" id="skin">
<option value="">{$lang->select}</option> <option value="">{$lang->select}</option>
<option loop="$skin_list => $skin_name, $skin" value="{$skin_name}">{$skin->title} ({$skin_name})</option> <option loop="$skin_list => $skin_name, $skin" value="{$skin_name}">{$skin->title}({$skin_name})</option>
</select> </select>
<input type="button" class="x_btn" value="{$lang->cmd_select}" /> <input type="button" class="x_btn" value="{$lang->cmd_select}" />
</div> </div>

View file

@ -1,13 +1,11 @@
<load target="../../admin/tpl/js/admin.js" usecdn="true" /> <load target="../../admin/tpl/css/admin.bootstrap.css" usecdn="true" />
<load target="../../admin/tpl/css/admin.css" usecdn="true" /> <load target="../../admin/tpl/css/admin.css" usecdn="true" />
<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" /> <load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" />
<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" /> <load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" />
<load target="../../admin/tpl/js/admin.js" usecdn="true" />
<load target="js/generate_code.js" usecdn="true" /> <load target="js/generate_code.js" usecdn="true" />
<load target="../../../common/css/bootstrap.min.css" index="1" usecdn="true" />
<load target="../../admin/tpl/js/jquery.tmpl.js" usecdn="true" /> <load target="../../admin/tpl/js/jquery.tmpl.js" usecdn="true" />
<load target="../../admin/tpl/js/jquery.jstree.js" usecdn="true" /> <load target="../../admin/tpl/js/jquery.jstree.js" usecdn="true" />
<load target="../../admin/tpl/css/admin.bootstrap.css" usecdn="true" />
<script> <script>
xe.lang.cmd_delete = '{$lang->cmd_delete}'; xe.lang.cmd_delete = '{$lang->cmd_delete}';
@ -15,37 +13,30 @@
doFillWidgetVars(); doFillWidgetVars();
}); });
</script> </script>
<div cond="$type=='faceoff'" class="x" style="padding: 0 10px;"> <div class="x">
<form> <div class="x_modal-header">
<input type="hidden" name="module" value="widget" /> <h1>{$widget_info->title} {$lang->cmd_generate_code}</h1>
<input type="hidden" name="type" value="faceoff" /> </div>
<input type="hidden" name="act" value="dispWidgetGenerateCodeInPage" /> <div id="content" class="x_modal-body">
<input type="hidden" name="error_return_url" value="" /> <p>{$widget_info->description} {$lang->about_widget_code_in_page}</p>
<form cond="$type=='faceoff'" class="x_form-horizontal">
<h2>{$lang->widget}</h2> <input type="hidden" name="module" value="widget" />
<ul> <input type="hidden" name="type" value="faceoff" />
<li> <input type="hidden" name="act" value="dispWidgetGenerateCodeInPage" />
<p class="a"> <input type="hidden" name="error_return_url" value="" />
<select name="selected_widget"> <div class="x_control-group">
<label for="selected_widget" class="x_control-label">
{$lang->widget}
</label>
<div class="x_controls">
<select name="selected_widget" id="selected_widget" style="margin:0">
<option loop="$widget_list => $list_widget_info" value="{$list_widget_info->widget}">{$list_widget_info->title}</option> <option loop="$widget_list => $list_widget_info" value="{$list_widget_info->widget}">{$list_widget_info->title}</option>
</select> </select>
<input type="submit" value="{$lang->cmd_select}" /> <input type="submit" value="{$lang->cmd_select}" class="x_btn" />
</p> </div>
</li> </div>
</ul> </form>
</form> <form class="x_form-horizontal" action="./" method="post" id="fo_widget">
</div>
<div class="x" style="padding: 10px">
<div class="x_page-header">
<h1>{$widget_info->title}</h1>
</div>
<p>{$widget_info->description}</p>
<div id="content" class="x_well">
<h2>{$lang->cmd_generate_code}</h2>
<p>{$lang->about_widget_code_in_page}</p>
<form class="x_form x_form-horizontal" action="./" method="post" id="fo_widget">
<input type="hidden" name="module" value="widget" /> <input type="hidden" name="module" value="widget" />
<input type="hidden" name="module_srl" value="{$module_srl}" /> <input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="widget_sequence" value="" /> <input type="hidden" name="widget_sequence" value="" />

View file

@ -1,112 +1,123 @@
<div id="tmpPageSizeLayer" class="layer x"> <div id="tmpPageSizeLayer" class="x_modal x wgs">
<button type="button" class="x_close" data-hide=".wgs">&times;</button>
<form action="index.php"> <form action="index.php">
<table class="x_table x_table-striped x_table-hover"> <div class="x_modal-header">
<col width="140" /> <h1>{$lang->widgetstyle}</h1>
<col /> </div>
<col /> <div class="x_modal-body">
<tr> <table class="x_table x_table-striped x_table-hover">
<th>{$lang->cmd_widget_align}</th> <col width="140" />
<td colspan="2"> <col />
<select name="widget_align"> <col />
<option value="left">{$lang->cmd_widget_align_left}</option> <tr>
<option value="right">{$lang->cmd_widget_align_right}</option> <th>{$lang->cmd_widget_align}</th>
</select> <td colspan="2">
</td> <select name="widget_align">
</tr> <option value="left">{$lang->cmd_widget_align_left}</option>
<tr> <option value="right">{$lang->cmd_widget_align_right}</option>
<th class="line">{$lang->cmd_widget_size}</th>
<td colspan="2" class="line"><input type="text" name="width" class="input" value="" /> - <input type="text" class="input" name="height" value="" /></td>
</tr>
<tr>
<th rowspan="3" class="line">{$lang->cmd_widget_margin}</th>
<td colspan="2" class="line tCenter"><input type="text" name="margin_top" class="input" value="" />px</td>
</tr>
<tr>
<td><input type="text" name="margin_left" class="input" value="" />px</td>
<td class="tRight"><input type="text" name="margin_right" class="input" value="" />px</td>
</tr>
<tr>
<td colspan="2" class="tCenter"><input type="text" name="margin_bottom" class="input" value="" />px</td>
</tr>
<tr>
<th rowspan="3" class="line">{$lang->cmd_widget_padding}</th>
<td colspan="2" class="line tCenter"><input type="text" name="padding_top" class="input" value="" />px</td>
</tr>
<tr>
<td><input type="text" name="padding_left" class="input" value="" />px</td>
<td class="tRight"><input type="text" name="padding_right" class="input" value="" />px</td>
</tr>
<tr>
<td colspan="2" class="tCenter"><input type="text" name="padding_bottom" class="input" value="" />px</td>
</tr>
<tr>
<th rowspan="3" class="line">{$lang->cmd_widget_border}</th>
<td colspan="2" class="tCenter line">
<input type="text" name="border_top_thick" value="" class="small_input" />px
<select name="border_top_type">
<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="6"/>
</td>
</tr>
<tr>
<td>
<input type="text" name="border_left_thick" value="" class="small_input" />px
<select name="border_left_type">
<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="6"/>
</td>
<td class="tRight">
<input type="text" name="border_right_thick" value="" class="small_input" />px
<select name="border_right_type">
<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="6"/>
</td>
</tr>
<tr>
<td colspan="2" class="tCenter">
<input type="text" name="border_bottom_thick" value="" class="small_input" />px
<select name="border_bottom_type">
<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="6"/>
</td>
</tr>
<tr>
<th class="line">{$lang->cmd_widget_background_color}</th>
<td colspan="2" class="line"><input type="text" name="background_color" value="" class="input color-indicator" /></td>
</tr>
<tr>
<th class="line">{$lang->cmd_widget_background_image_url}</th>
<td colspan="2" class="line">
<div><input type="text" name="background_image_url" value="" class="full_input"/></div>
<div>
<select name="background_repeat">
<option value="repeat">{$lang->cmd_widget_background_image_repeat}</option>
<option value="no-repeat">{$lang->cmd_widget_background_image_no_repeat}</option>
<option value="repeat-x">{$lang->cmd_widget_background_image_x_repeat}</option>
<option value="repeat-y">{$lang->cmd_widget_background_image_y_repeat}</option>
</select> </select>
</div> </td>
<div> </tr>
{$lang->cmd_widget_background_image_x} : <input type="text" name="background_x" value="0" class="input" /> <tr>
</div> <th>{$lang->cmd_widget_size}</th>
<div> <td colspan="2"><input type="text" name="width" value="" /> - <input type="text" name="height" value="" /></td>
{$lang->cmd_widget_background_image_y} : <input type="text" name="background_y" value="0" class="input" /> </tr>
</div> <tr>
</td> <th rowspan="3">{$lang->cmd_widget_margin}</th>
</tr> <td colspan="2" class="line tCenter"><input type="text" name="margin_top" value="" /> px</td>
</table> </tr>
<div class="btnArea"> <tr>
<input class="btn" type="submit" value="{$lang->cmd_save}" /> <td><input type="text" name="margin_left" value="" /> px</td>
<td class="tRight"><input type="text" name="margin_right" value="" /> px</td>
</tr>
<tr>
<td colspan="2" class="tCenter"><input type="text" name="margin_bottom" value="" /> px</td>
</tr>
<tr>
<th rowspan="3">{$lang->cmd_widget_padding}</th>
<td colspan="2" class="line tCenter"><input type="text" name="padding_top" value="" /> px</td>
</tr>
<tr>
<td><input type="text" name="padding_left" value="" /> px</td>
<td class="tRight"><input type="text" name="padding_right" value="" /> px</td>
</tr>
<tr>
<td colspan="2" class="tCenter"><input type="text" name="padding_bottom" value="" /> px</td>
</tr>
<tr>
<th rowspan="3">{$lang->cmd_widget_border}</th>
<td colspan="2" class="tCenter line">
<input type="text" name="border_top_thick" value="" class="small_input" /> px
<select name="border_top_type">
<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="6"/>
</td>
</tr>
<tr>
<td>
<input type="text" name="border_left_thick" value="" class="small_input" /> px
<select name="border_left_type">
<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="6"/>
</td>
<td class="tRight">
<input type="text" name="border_right_thick" value="" class="small_input" /> px
<select name="border_right_type">
<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="6"/>
</td>
</tr>
<tr>
<td colspan="2" class="tCenter">
<input type="text" name="border_bottom_thick" value="" class="small_input" /> px
<select name="border_bottom_type">
<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="6"/>
</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>
</tr>
<tr>
<th>{$lang->cmd_widget_background_image_url}</th>
<td colspan="2">
<div style="margin-bottom:5px"><input type="text" name="background_image_url" value="" style="width:400px"/></div>
<div style="margin-bottom:5px">
<select name="background_repeat">
<option value="repeat">{$lang->cmd_widget_background_image_repeat}</option>
<option value="no-repeat">{$lang->cmd_widget_background_image_no_repeat}</option>
<option value="repeat-x">{$lang->cmd_widget_background_image_x_repeat}</option>
<option value="repeat-y">{$lang->cmd_widget_background_image_y_repeat}</option>
</select>
</div>
<div style="margin-bottom:5px">
{$lang->cmd_widget_background_image_x} : <input type="text" name="background_x" value="0" />
</div>
<div style="margin-bottom:5px">
{$lang->cmd_widget_background_image_y} : <input type="text" name="background_y" value="0" />
</div>
</td>
</tr>
</table>
</div>
<div class="x_modal-footer">
<input class="x_btn x_btn-inverse" type="submit" value="{$lang->cmd_save}" />
</div> </div>
</form> </form>
<style scoped>
.wgs{margin:0;width:700px}
.wgs select{margin:0;width:auto}
.wgs input{margin:0 !important;width:50px}
</style>
</div> </div>
<!--%load_js_plugin("ui.colorpicker")--> <!--%load_js_plugin("ui.colorpicker")-->

View file

@ -1,41 +1,37 @@
<load target="../../admin/tpl/js/admin.js" usecdn="true" /> <load target="../../admin/tpl/css/admin.bootstrap.css" usecdn="true" />
<load target="../../admin/tpl/css/admin.css" usecdn="true" /> <load target="../../admin/tpl/css/admin.css" usecdn="true" />
<load target="../../../common/css/bootstrap.min.css" usecdn="true" />
<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" /> <load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" />
<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" /> <load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" />
<load target="css/widget.css" usecdn="true" /> <load target="css/widget.css" usecdn="true" />
<load target="../../admin/tpl/js/admin.js" usecdn="true" />
<load target="js/generate_code.js" usecdn="true" /> <load target="js/generate_code.js" usecdn="true" />
<!--%load_js_plugin("ui.colorpicker")--> <!--%load_js_plugin("ui.colorpicker")-->
<script> <script>
jQuery(document).ready(function(){ jQuery(function(){
getWidgetVars(); getWidgetVars();
}); });
</script> </script>
<div class="x">
<div class="x" style="padding: 0 10px;"> <form action="./" method="post" id="fo_widget">
<div id="content"> <input type="hidden" name="module_srl" value="{$module_srl}" />
<div class="x_page-header"> <input type="hidden" name="widget_sequence" value="" />
<input type="hidden" name="style" value="" />
<input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="widget_padding_bottom" value="" />
<input type="hidden" name="module" value="widget" />
<input type="hidden" name="act" value="" />
<input type="hidden" name="widgetstyle" value="{$widgetstyle}" />
<input type="hidden" name="selected_widget" value="{$selected_widget}" />
<div class="x_modal-header">
<h1>{$lang->widgetstyle}</h1> <h1>{$lang->widgetstyle}</h1>
</div> </div>
<div class="x_modal-body x_form-horizontal">
<form class="x_form x_form-horizontal" action="./" method="post" id="fo_widget">
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="widget_sequence" value="" />
<input type="hidden" name="style" value="" />
<input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="widget_padding_bottom" value="" />
<input type="hidden" name="module" value="widget" />
<input type="hidden" name="act" value="" />
<input type="hidden" name="widgetstyle" value="{$widgetstyle}" />
<input type="hidden" name="selected_widget" value="{$selected_widget}" />
<a href="{getUrl('widgetstyle','none')}" class="widgetStyle"><img src="images/widgetstyle_none.gif" title="{$lang->notuse}" /></a> <a href="{getUrl('widgetstyle','none')}" class="widgetStyle"><img src="images/widgetstyle_none.gif" title="{$lang->notuse}" /></a>
<a loop="$widgetStyle_list => $key, $widgetStyle" cond="$widgetStyle->preview" href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle==$widgetstyle)-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /><span>{$widgetStyle->title}</span></a> <a loop="$widgetStyle_list => $key, $widgetStyle" cond="$widgetStyle->preview" href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle==$widgetstyle)-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /><span>{$widgetStyle->title}</span></a>
<block cond="$widgetstyle_info"> <block cond="$widgetstyle_info">
<h2>{$widgetstyle_info->title} ver {$widgetstyle_info->version}</h2> <h2>{$widgetstyle_info->title} ver {$widgetstyle_info->version}</h2>
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label">{$lang->description}</label> <label class="x_control-label">{$lang->description}</label>
@ -57,7 +53,7 @@
{zdate($widgetstyle_info->date,'Y-m-d')} {zdate($widgetstyle_info->date,'Y-m-d')}
</div> </div>
</div> </div>
<block loop="$widgetstyle_info->extra_var => $id, $var"> <block loop="$widgetstyle_info->extra_var => $id, $var">
{@$suggestion_id++} {@$suggestion_id++}
<block cond="!$not_first && !$var->group"><section class="section"></block> <block cond="!$not_first && !$var->group"><section class="section"></block>
@ -74,17 +70,17 @@
<div cond="$var->type == 'text'"> <div cond="$var->type == 'text'">
<input type="text" name="{$id}" value="" class="lang_code" /> <input type="text" name="{$id}" value="" class="lang_code" />
</div> </div>
<input cond="$var->type == 'color'" type="text" name="{$id}" class="color-indicator" /> <input cond="$var->type == 'color'" type="text" name="{$id}" class="color-indicator" />
<div cond="$var->type == 'textarea'"> <div cond="$var->type == 'textarea'">
<textarea name="{$id}" rows="8" cols="42" class="lang_code"></textarea> <textarea name="{$id}" rows="8" cols="42" class="lang_code"></textarea>
</div> </div>
<select cond="$var->type == 'select'" name="{$id}"> <select cond="$var->type == 'select'" name="{$id}">
<option loop="$var->options => $key, $val" value="{$key}">{$val}</option> <option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
</select> </select>
<block cond="$var->type == 'filebox'"> <block cond="$var->type == 'filebox'">
<input type="hidden" name="{$id}" /> <input type="hidden" name="{$id}" />
<a href="#modalFilebox" class="modalAnchor filebox">{$lang->cmd_select}</a> <a href="#modalFilebox" class="modalAnchor filebox">{$lang->cmd_select}</a>
@ -96,14 +92,13 @@
</block> </block>
</section> </section>
</block> </block>
</div>
<div class="btnArea"> <div class="x_modal-footer">
<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_setup}" /> <input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_setup}" />
</div> </div>
</form> </form>
<script> <script>
xe.current_lang = "{$lang_type}"; xe.current_lang = "{$lang_type}";
</script> </script>
<include target="../../module/tpl/include.filebox.html" /> <include target="../../module/tpl/include.filebox.html" />
</div>
</div> </div>

View file

@ -114,6 +114,7 @@ class widgetView extends widget
$oWidgetModel = &getModel('widget'); $oWidgetModel = &getModel('widget');
$widget_list = $oWidgetModel->getDownloadedWidgetList(); $widget_list = $oWidgetModel->getDownloadedWidgetList();
Context::set('widget_list',$widget_list); Context::set('widget_list',$widget_list);
Context::set('admin_bar','false');
// When there is no widget is selected in the first widget // When there is no widget is selected in the first widget
if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget); if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
@ -131,6 +132,7 @@ class widgetView extends widget
$oWidgetModel = &getModel('widget'); $oWidgetModel = &getModel('widget');
$widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList(); $widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
Context::set('widgetStyle_list',$widgetStyle_list); Context::set('widgetStyle_list',$widgetStyle_list);
Context::set('admin_bar','false');
// Selected list of widget styles // Selected list of widget styles
$widgetstyle = Context::get('widgetstyle'); $widgetstyle = Context::get('widgetstyle');
$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle); $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);

View file

@ -18,7 +18,6 @@
<description xml:lang="tr">Bu görsel bileşen yazılar, yorumlar ve ekli dosyalar gibi içerikleri görüntüler.</description> <description xml:lang="tr">Bu görsel bileşen yazılar, yorumlar ve ekli dosyalar gibi içerikleri görüntüler.</description>
<version>0.1</version> <version>0.1</version>
<date>2009-03-16</date> <date>2009-03-16</date>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/"> <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name> <name xml:lang="ko">NHN</name>
<name xml:lang="zh-CN">NHN</name> <name xml:lang="zh-CN">NHN</name>
@ -30,7 +29,6 @@
<name xml:lang="zh-TW">NHN</name> <name xml:lang="zh-TW">NHN</name>
<name xml:lang="tr">NHN</name> <name xml:lang="tr">NHN</name>
</author> </author>
<extra_vars> <extra_vars>
<group> <group>
<title xml:lang="ko">추출 대상</title> <title xml:lang="ko">추출 대상</title>
@ -394,7 +392,6 @@
</options> </options>
</var> </var>
</group> </group>
<group> <group>
<title xml:lang="ko">목록 상세 설정</title> <title xml:lang="ko">목록 상세 설정</title>
<var id="option_view" type="select-multi-order"> <var id="option_view" type="select-multi-order">
@ -461,7 +458,6 @@
<name xml:lang="tr">İçerik</name> <name xml:lang="tr">İçerik</name>
</options> </options>
</var> </var>
<var id="show_browser_title" type="select"> <var id="show_browser_title" type="select">
<name xml:lang="ko">게시판 이름 표시</name> <name xml:lang="ko">게시판 이름 표시</name>
<name xml:lang="en">Display Article Name</name> <name xml:lang="en">Display Article Name</name>
@ -494,7 +490,6 @@
<name xml:lang="tr">Görüntüleme</name> <name xml:lang="tr">Görüntüleme</name>
</options> </options>
</var> </var>
<var id="show_comment_count" type="select"> <var id="show_comment_count" type="select">
<name xml:lang="ko">댓글수 표시</name> <name xml:lang="ko">댓글수 표시</name>
<name xml:lang="en">Comment Count</name> <name xml:lang="en">Comment Count</name>
@ -527,7 +522,6 @@
<name xml:lang="tr">Görüntüleme</name> <name xml:lang="tr">Görüntüleme</name>
</options> </options>
</var> </var>
<var id="show_trackback_count" type="select"> <var id="show_trackback_count" type="select">
<name xml:lang="ko">엮인글수 표시</name> <name xml:lang="ko">엮인글수 표시</name>
<name xml:lang="en">Trackback</name> <name xml:lang="en">Trackback</name>
@ -643,9 +637,8 @@
<description xml:lang="tr">Yeni öğe için gösterim süresini ayarlayabilirsiniz. (birim olarak saat kullanılır)</description> <description xml:lang="tr">Yeni öğe için gösterim süresini ayarlayabilirsiniz. (birim olarak saat kullanılır)</description>
</var> </var>
</group> </group>
<group> <group>
<title xml:lang="ko">정렬</title> <title xml:lang="ko">정렬</title>
<var id="order_target" type="select"> <var id="order_target" type="select">
<name xml:lang="ko">정렬 대상</name> <name xml:lang="ko">정렬 대상</name>
<name xml:lang="zh-CN">排序对象</name> <name xml:lang="zh-CN">排序对象</name>
@ -735,10 +728,8 @@
</options> </options>
</var> </var>
</group> </group>
<group> <group>
<title xml:lang="ko">썸네일</title> <title xml:lang="ko">썸네일</title>
<var id="thumbnail_type" type="select"> <var id="thumbnail_type" type="select">
<name xml:lang="ko">썸네일 생성 방법</name> <name xml:lang="ko">썸네일 생성 방법</name>
<name xml:lang="jp">サムネール生成方法</name> <name xml:lang="jp">サムネール生成方法</name>
@ -818,9 +809,8 @@
<description xml:lang="tr">Resim yüksekliğini ayarlayabilirsiniz. (varsayılan değer 75'tir)</description> <description xml:lang="tr">Resim yüksekliğini ayarlayabilirsiniz. (varsayılan değer 75'tir)</description>
</var> </var>
</group> </group>
<group> <group>
<title xml:lang="ko">RSS 설정</title> <title xml:lang="ko">RSS 설정</title>
<var id="rss_url0" type="text"> <var id="rss_url0" type="text">
<name xml:lang="ko">피드(RSS/ATOM) 주소</name> <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
<name xml:lang="jp">Feed(RSS/ATOM) URL</name> <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
@ -886,6 +876,6 @@
<name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name> <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
<name xml:lang="tr">Feed(RSS/ATOM) URL</name> <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
</var> </var>
</group> </group>
</extra_vars> </extra_vars>
</widget> </widget>