fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-29 08:09:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editor/skins/dreditor/css/dreditor.css
View file

@ -89,9 +89,9 @@
.wArea .buttonArea .info{ display:inline; padding:0 0 0 15px; color:#777;}
.wArea .inputTitle{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:14px; margin-bottom:10px;}
.wArea .inputLink{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:11px; margin-bottom:10px;}
.wArea .inputText{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:12px; margin-bottom:10px;}
.wArea .iText{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:12px; margin-bottom:10px;}
.wArea .inputFile{ width:100%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:29px; font-size:12px; margin-bottom:10px;}
.wArea .inputTextarea{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:10px 0 0 10px; height:150px; font-size:12px; line-height:1.5; margin-bottom:10px;}
.wArea .iTextArea{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:10px 0 0 10px; height:150px; font-size:12px; line-height:1.5; margin-bottom:10px;}
.wArea .inputRadio{ width:13px; height:13px; vertical-align:middle;}
.wArea .hr{ border-top:1px solid #e6e6e6; border-bottom:1px solid #fff; font-size:0; line-height:0; overflow:hidden; height:0; margin:15px -20px;}

2
modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.html
View file

@ -3,7 +3,7 @@
<div class="wArea fold">
<fieldset>
<legend>{$lang->edit->fold}</legend>
<input name="" type="text" class="inputText" value="" title="{$lang->edit->fold_default}" />
<input name="" type="text" class="iText" value="" title="{$lang->edit->fold_default}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button"><img src="iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button"><img src="buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>

20
modules/editor/skins/dreditor/editor.html
View file

@ -282,9 +282,9 @@
<!-- class="wArea link" | class="wArea link open" -->
<fieldset>
<legend>{$lang->edit->link}</legend>
<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_site_name}" />
<input name="" type="text" class="iText" value="" title="{$lang->edit->insert_site_name}" />
<input name="" type="text" class="inputLink" value="" title="http://" />
<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_explain}" />
<input name="" type="text" class="iText" value="" title="{$lang->edit->insert_explain}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
@ -327,8 +327,8 @@
<!-- class="wArea blockquote" | class="wArea blockquote open" -->
<fieldset>
<legend>{$lang->edit->blockquote}</legend>
<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_blockquote}"></textarea>
<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
<textarea name="" rows="8" cols="42" class="iTextArea" title="{$lang->edit->insert_blockquote}"></textarea>
<input name="" type="text" class="iText" value="" title="{$lang->edit->insert_cite}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
@ -368,7 +368,7 @@
</dl>
<p class="resizeError">{$lang->edit->resize_error}</p>
</div>
<input name="" type="text" class="inputText desc" value="" title="{$lang->edit->insert_image_explain}" />
<input name="" type="text" class="iText desc" value="" title="{$lang->edit->insert_image_explain}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
@ -384,9 +384,9 @@
<!-- class="wArea mov" | class="wArea mov open" -->
<fieldset>
<legend>{$lang->edit->mov}</legend>
<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_mov}"></textarea>
<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_mov_explain}"></textarea>
<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
<textarea name="" rows="8" cols="42" class="iTextArea" title="{$lang->edit->insert_mov}"></textarea>
<textarea name="" rows="8" cols="42" class="iTextArea" title="{$lang->edit->insert_mov_explain}"></textarea>
<input name="" type="text" class="iText" value="" title="{$lang->edit->insert_cite}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
@ -431,8 +431,8 @@
</dl>
<p class="summary">{$lang->edit->file_total} <em class="filesize">{total_filesize}</em></p>
<div class="hr"></div>
<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_file_explain}" />
<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
<input name="" type="text" class="iText" value="" title="{$lang->edit->insert_file_explain}" />
<input name="" type="text" class="iText" value="" title="{$lang->edit->insert_cite}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>