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

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/editor/components/emoticon/tpl/popup.css
View file

@ -1,6 +1,5 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
img.emoticon { margin:10px 10px 0 0; cursor:pointer; }
.emoticonList { position:absolute; right:40px; top:4px;}
@import url(../../../../../common/css/bootstrap.min.css);
img.emoticon{ margin:10px 10px 0 0; cursor:pointer}
#emoticons{padding:0 10px 20px 10px}

26
modules/editor/components/emoticon/tpl/popup.html
View file

@ -1,11 +1,15 @@
<!--%import("popup.js")-->
<!--%import("popup.css")-->
<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
<div class="emoticonList">
<select name="list" id="selectEmoticonList">
<!--@foreach($emoticon_list as $key => $val)-->
<option <!--@if($val=='msn')-->selected="select"<!--@end--> value="{$val}">{$val}</option>
<!--@end-->
</select>
</div>
<div id="emoticons"></div>
<load target="popup.js" />
<load target="popup.css" />
<section class="section">
<h1>{$component_info->title} ver. {$component_info->version}</h1>
<div class="x_clearfix">
<div class="x_pull-right">
<select name="list" id="selectEmoticonList">
<!--@foreach($emoticon_list as $key => $val)-->
<option <!--@if($val=='msn')-->selected="select"<!--@end--> value="{$val}">{$val}</option>
<!--@end-->
</select>
</div>
</div>
<div id="emoticons" style="height:1px"></div>
</section>