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

다른 프레임워크와 css 충돌을 피하기 위해 rhymix.less의 class/id 이름에 prefix 처리

Browse source 
변경전의 xe.less 파일도 rhymix.less와 함께 load 하여 호환정 유지

CSS 충돌 예)
bootstrap의 .btn
사용 예)
bootstrap 사용시엔 {Context::unloadBasicFiles('xe')}으로 unload 시키면 문제없음
This commit is contained in:
conory 2018-08-03 19:45:30 +09:00
parent 30e0a5c583
commit b1cb1f3f34
251 changed files with 938 additions and 776 deletions
Download patch file Download diff file Expand all files Collapse all files

6
addons/autolink/autolink.js
View file

@ -24,7 +24,7 @@
var thisPlugin = this;
// extract target text nodes
this.extractTargets($('.xe_content'));
this.extractTargets($('.rhymix_content, .xe_content'));
$(this.targets).each(function(){
thisPlugin.cast('AUTOLINK', [this]);
@ -63,7 +63,7 @@
},
extractTargets : function(obj) {
var thisPlugin = this;
var wrap = $('.xe_content', obj);
var wrap = $('.rhymix_content, .xe_content', obj);
if(wrap.length) {
this.extractTargets(wrap);
return;
@ -93,7 +93,7 @@
xe.registerPlugin(new AutoLink());
$(document).on('click', '.xe_content a', function() {
$(document).on('click', '.rhymix_content a, .xe_content a', function() {
if (!$(this).attr("target")) {
$(this).attr("target", "_blank");
}

2
addons/autolink/autolink.spec.html
View file

@ -82,7 +82,7 @@ describe('Autolink trigger', {
// ]]></script>
</head>
<body>
<div class="xe_content" style="display:none">
<div class="rhymix_content" style="display:none">
<div id="test1">This is autolink test. This text don't have any link text.</div>
<div id="test2">http://mygony.com</div>
<div id="test3">Go to http://mygony.com</div>

2
addons/photoswipe/rx_photoswipe.js
View file

@ -256,4 +256,4 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
// execute above function
initPhotoSwipeFromDOM('.xe_content');
initPhotoSwipeFromDOM('.rhymix_content, .xe_content');

2
addons/resize_image/css/resize_image.mobile.css
View file

@ -1 +1 @@
.xe_content img{max-width:100%;height:auto !important}
.rhymix_content img, .xe_content img{max-width:100%;height:auto !important}

4
addons/resize_image/js/resize_image.js
View file

@ -189,7 +189,7 @@ function getScreen() {
// 이미지 슬라이드를 보는 함수
function slideshow(event) {
var container = $(this).closest('.xe_content');
var container = $(this).closest('.rhymix_content, .xe_content');
var imglist = container.find("img[rel=xe_gallery]");
var currentIdx = $.inArray($(this).get(0), imglist.get());
var xScreen = getScreen();
@ -242,7 +242,7 @@ $(window).load(function(){
});
}
$('.xe_content').each(function() {
$('.rhymix_content, .xe_content').each(function() {
var contentWidth = dummy.appendTo(this).width();
dummy.remove();
if(!contentWidth) return;

2
classes/context/Context.class.php
View file

@ -2101,7 +2101,7 @@ class Context
}
/**
* unload basic files that load in HTMLDisplayHandler (all|css/rhymix|css/mobile|js/jquery|js/rhymix)
* unload basic files that load in HTMLDisplayHandler (all|css/rhymix|css/mobile|css/xe|js/jquery|js/rhymix)
*
* @return void
*/

4
classes/display/HTMLDisplayHandler.php
View file

@ -565,6 +565,10 @@ class HTMLDisplayHandler
{
$this->_loadBasicFile('common/css/rhymix.less', -1600000000);
}
if(!in_array('css/xe', Context::getUnloadedBasicFiles()))
{
$this->_loadBasicFile('common/css/xe.less', -1600000000);
}
if(!in_array('css/mobile', Context::getUnloadedBasicFiles()) && Mobile::isFromMobilePhone())
{
$this->_loadBasicFile('common/css/mobile.css', -1500000000);

2
classes/extravar/Extravar.class.php
View file

@ -447,7 +447,7 @@ class ExtraItem
$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />';
$buff[] = '<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
$buff[] = '<input type="button" value="' . lang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
$buff[] = '<input type="button" value="' . lang('cmd_delete') . '" class="rhymix_button" id="dateRemover_' . $column_name . '" />';
$buff[] = '<script type="text/javascript">';
$buff[] = '//<![CDATA[';
$buff[] = '(function($){';

36
common/css/mobile.css
View file

@ -1,37 +1 @@
@charset "utf-8";
/*! Copyright (C) NAVER <http://www.navercorp.com> */
/* @author NAVER <developers@xpressengine.com> */
/* Message */
.message {
position: relative;
margin: 1em 0;
padding: 0 1em;
border: 1px solid #ddd;
border-radius: 4px;
line-height: 1.4;
font-size: 13px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #f8f8f8;
}
body>.message {
margin: 1em;
}
.message p {
margin: 1em 0 !important;
}
.message.info {
border-color: #BCE8F1;
color: #3A87AD;
background-color: #D9EDF7;
}
.message.error {
border-color: #EED3D7;
color: #B94A48;
background-color: #F2DEDE;
}
.message.update {
border-color: #D6E9C6;
color: #468847;
background-color: #DFF0D8;
}

142
common/css/rhymix.less
View file

@ -1,22 +1,9 @@
@charset "UTF-8";
/* Element Reset */
body, table, input, textarea, select, button {
font-family: sans-serif;
font-size: 12px;
}
article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
display: block;
}
body {
position: relative;
}
a img {
border: 0;
}
[hidden] {
display: none;
}
/* Content Default Styles */
.word_break(@wb) when (@wb = normal), (@wb = keep-all), (@wb = break-all) {
@ -26,7 +13,7 @@ a img {
.word_break(@wb) when (@wb = none) {
white-space: nowrap;
}
.xe_content {
.rhymix_content, .xe_content {
font-family: @default_font_family;
font-size: @default_font_size;
line-height: @default_line_height;
@ -39,14 +26,9 @@ a img {
height: auto;
}
}
@media screen {
img {
max-width: none;
}
}
/* Clearfix */
.xe-clearfix {
.rhymix_clearfix {
&:before, &:after {
content: " ";
display: table;
@ -56,12 +38,12 @@ a img {
}
zoom: 1;
}
.xe-widget-wrapper {
.rhymix_widget {
overflow: hidden;
}
/* Popup Menu Area */
#popup_menu_area {
/* Popup Menu */
#rhymix_popup_menu {
position: absolute;
z-index: 9999;
margin: 10px 0;
@ -94,7 +76,7 @@ a img {
}
}
@media screen and (max-width: 400px) {
#popup_menu_area {
#rhymix_popup_menu {
min-width:120px;
max-width:95%;
font-size: 13px;
@ -108,7 +90,7 @@ a img {
}
/* Editable Preview */
.editable_preview {
.rhymix_editable_preview {
width: 100%;
min-height: 240px;
max-height: 440px;
@ -124,7 +106,7 @@ a img {
margin-bottom: @default_paragraph_spacing !important;
}
}
.editable_preview_iframe {
.rhymix_editable_preview_iframe {
width: 100%;
height: 440px;
box-sizing: border-box;
@ -134,7 +116,7 @@ a img {
}
/* Message */
.message {
.rhymix_message {
position: relative;
margin: 1em 0;
padding: 0 1em;
@ -162,13 +144,13 @@ a img {
color: #468847;
background-color: #DFF0D8;
}
}
body > .message {
margin: 1em;
body > & {
margin: 1em;
}
}
/* Waiting for server response */
.wfsr {
#rhymix_waiting {
z-index: 100;
display: none;
position: fixed;
@ -188,19 +170,7 @@ body > .message {
}
/* Button */
.btnArea {
clear: both;
margin: 10px 0;
padding: 0;
text-align: right;
zoom: 1;
&:after {
clear: both;
display: block;
content: "";
}
}
.btn {
.rhymix_button {
display: inline-block;
*display: inline;
margin: 0;
@ -219,7 +189,7 @@ body > .message {
line-height: 24px !important;
font-family: inherit;
font-size: 12px;
color: #333333;
color: #333;
*zoom: 1;
cursor: pointer;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
@ -233,11 +203,44 @@ body > .message {
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
&:hover, &:active, &[disabled] {
&:hover, &:focus, &:active, &.active, &.disabled &[disabled] {
color: #333;
background-color: #e6e6e6;
*background-color: #d9d9d9;
}
&:hover, &:focus {
background-position:0 -15px;
-webkit-transition:background-position 0.1s linear;
-moz-transition:background-position 0.1s linear;
-o-transition:background-position 0.1s linear;
transition:background-position 0.1s linear;
}
&:focus {
outline:thin dotted #333;
outline:5px auto -webkit-focus-ring-color;
outline-offset:-2px;
}
&:active, &.active {
background-color:#ccc;
background-image:none;
outline:0;
box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
}
&.disabled &[disabled] {
cursor:default;
background-image:none;
opacity:0.65;filter:alpha(opacity=65);
box-shadow:none;
}
button&, input& {
*padding-top:3px;
*padding-bottom:3px;
height: 26px !important;
}
button&::-moz-focus-inner, input&::-moz-focus-inner {
padding:0;
border:0;
}
>a, >button, >input, >span {
display: inline-block;
*zoom: 1;
@ -256,11 +259,46 @@ body > .message {
cursor: pointer;
background: none;
}
&.inverse {
color:#fff;
border-color:#222222 #222222 #000000;
text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);
background-color:#363636;
*background-color:#222222;
background-image:-moz-linear-gradient(top, #444444, #222222);
background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
background-image:-webkit-linear-gradient(top, #444444, #222222);
background-image:-o-linear-gradient(top, #444444, #222222);
background-image:linear-gradient(to bottom, #444444, #222222);
background-repeat:repeat-x;
border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
&:hover, &:focus, &:active, &.active, &.disabled &[disabled] {
background-color:#222222;
*background-color:#151515;
}
&:active, &.active {
background-color:#080808
}
&.active {
color:rgba(255, 255, 255, 0.75);
}
}
}
input.btn, button.btn {
height: 26px !important;
.rhymix_button_wrapper {
clear: both;
margin: 10px 0;
padding: 0;
text-align: right;
zoom: 1;
&:after {
clear: both;
display: block;
content: "";
}
}
.btn-group {
.rhymix_button_group {
position: relative;
display: inline-block;
*display: inline;
@ -272,15 +310,15 @@ input.btn, button.btn {
&:first-child {
*margin-left: 0;
}
&+.btn-group {
&+.rhymix_button_group {
margin-left: 5px;
}
>.btn {
>.rhymix_button {
position: relative;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
&+.btn {
&+.rhymix_button {
margin-left: -1px;
}
&:first-child {

245
common/css/xe.less Normal file
View file

@ -0,0 +1,245 @@
@charset "UTF-8";
/* Element Reset */
article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
display: block;
}
body {
position: relative;
}
a img {
border: 0;
}
[hidden] {
display: none;
}
@media screen {
img {
max-width: none;
}
}
/* Clearfix */
.xe-clearfix {
&:before, &:after {
content: " ";
display: table;
}
&:after {
clear: both;
}
zoom: 1;
}
.xe-widget-wrapper {
overflow: hidden;
}
/* Message */
.message {
position: relative;
margin: 1em 0;
padding: 0 1em;
border: 1px solid #ddd;
border-radius: 4px;
line-height: 1.4;
font-size: 13px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #f8f8f8;
p {
margin: 1em 0 !important;
}
&.info {
border-color: #BCE8F1;
color: #3A87AD;
background-color: #D9EDF7;
}
&.error {
border-color: #EED3D7;
color: #B94A48;
background-color: #F2DEDE;
}
&.update {
border-color: #D6E9C6;
color: #468847;
background-color: #DFF0D8;
}
}
body > .message {
margin: 1em;
}
/* Button */
.btnArea {
clear: both;
margin: 10px 0;
padding: 0;
text-align: right;
zoom: 1;
&:after {
clear: both;
display: block;
content: "";
}
}
.btn {
display: inline-block;
*display: inline;
margin: 0;
padding: 0 12px !important;
height: 24px !important;
overflow: visible;
border: 1px solid #bbbbbb;
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-bottom-color: #a2a2a2;
border-radius: 2px;
text-decoration: none !important;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
vertical-align: top;
line-height: 24px !important;
font-family: inherit;
font-size: 12px;
color: #333333;
*zoom: 1;
cursor: pointer;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
background-color: #f5f5f5;
*background-color: #e6e6e6;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(top, #ffffff, #e6e6e6);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
&:hover, &:focus, &:active, &.active, &.disabled &[disabled] {
color: #333;
background-color: #e6e6e6;
*background-color: #d9d9d9;
}
&:hover, &:focus {
background-position:0 -15px;
-webkit-transition:background-position 0.1s linear;
-moz-transition:background-position 0.1s linear;
-o-transition:background-position 0.1s linear;
transition:background-position 0.1s linear;
}
&:focus {
outline:thin dotted #333;
outline:5px auto -webkit-focus-ring-color;
outline-offset:-2px;
}
&:active, &.active {
background-color:#ccc;
background-image:none;
outline:0;
box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
}
&.disabled &[disabled] {
cursor:default;
background-image:none;
opacity:0.65;filter:alpha(opacity=65);
box-shadow:none;
}
button.&, input[type="submit"].& {
*padding-top:3px;
*padding-bottom:3px;
height: 26px !important;
}
button.&::-moz-focus-inner, input[type="submit"].&::-moz-focus-inner {
padding:0;
border:0;
}
>a, >button, >input, >span {
display: inline-block;
*zoom: 1;
margin: 0 -12px !important;
padding: 0 12px !important;
overflow: visible;
width: auto;
height: 24px;
border: 0;
vertical-align: top;
text-decoration: none !important;
line-height: 24px;
font-family: inherit;
font-size: 12px;
color: #333;
cursor: pointer;
background: none;
}
}
.btn-inverse {
color:#ffffff!important;
text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);
background-color:#363636;
*background-color:#222222;
background-image:-moz-linear-gradient(top, #444444, #222222);
background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
background-image:-webkit-linear-gradient(top, #444444, #222222);
background-image:-o-linear-gradient(top, #444444, #222222);
background-image:linear-gradient(to bottom, #444444, #222222);
background-repeat:repeat-x;
border-color:#222222 #222222 #000000;
border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);
&:hover, &:focus, &:active, &.active, &.disabled &[disabled] {
color:#ffffff;
background-color:#222222;
*background-color:#151515;
}
&:active, &.active {
background-color:#080808
}
&.active {
color:rgba(255, 255, 255, 0.75);
}
}
.btn-group {
position: relative;
display: inline-block;
*display: inline;
*margin-left: .3em;
white-space: nowrap;
vertical-align: middle;
font-size: 0;
*zoom: 1;
&:first-child {
*margin-left: 0;
}
&+.btn-group {
margin-left: 5px;
}
>.btn {
position: relative;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
&+.btn {
margin-left: -1px;
}
&:first-child {
margin-left: 0;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
border-top-left-radius: 4px;
}
&:last-child {
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
}
&:hover, &:focus, &:active, &.active {
z-index: 2;
}
}
}

16
common/js/common.js
View file

@ -195,7 +195,7 @@
/* 레이어 출력 */
if(html) {
var area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
var area = $('#rhymix_popup_menu').html('<ul>'+html+'</ul>');
var areaOffset = {top:params.page_y, left:params.page_x};
if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop())
@ -286,21 +286,21 @@ jQuery(function($) {
});
/* Editor preview replacement */
$(".editable_preview").addClass("xe_content").attr("tabindex", 0);
$(".editable_preview").on("click", function() {
var input = $(this).siblings(".editable_preview_content");
$(".rhymix_editable_preview").addClass("rhymix_content").attr("tabindex", 0);
$(".rhymix_editable_preview").on("click", function() {
var input = $(this).siblings(".rhymix_editable_preview_content");
if (input.size()) {
$(this).off("click").off("focus").hide();
input = input.first();
if (input.attr("type") !== "hidden") {
input.hide();
}
var iframe = $('<iframe class="editable_preview_iframe"></iframe>');
var iframe = $('<iframe class="rhymix_editable_preview_iframe"></iframe>');
iframe.attr("src", current_url.setQuery("module", "editor").setQuery("act", "dispEditorFrame").setQuery("parent_input_id", input.attr("id")).replace(/^https?:/, ''));
iframe.insertAfter(input);
}
});
$(".editable_preview").on("focus", function() {
$(".rhymix_editable_preview").on("focus", function() {
$(this).triggerHandler("click");
});
@ -1080,8 +1080,8 @@ function get_by_id(id) {
jQuery(function($){
// display popup menu that contains member actions and document actions
$(document).on('click', function(evt) {
var $area = $('#popup_menu_area');
if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;" />').appendTo(document.body);
var $area = $('#rhymix_popup_menu');
if(!$area.length) $area = $('<div id="rhymix_popup_menu" tabindex="0" style="display:none;" />').appendTo(document.body);
// 이전에 호출되었을지 모르는 팝업메뉴 숨김
$area.hide();

2
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -22,7 +22,7 @@
actDeleteFile : '.xefu-act-delete',
actSetCover : '.xefu-act-set-cover',
tmplXeUploaderFileitem : '<li class="xefu-file xe-clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> Select</span></span></li>',
tmplXeUploaderFileitem : '<li class="xefu-file rhymix_clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> Select</span></span></li>',
tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image {{#if cover_image}}xefu-is-cover-image{{/if}}" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span><button class="xefu-act-set-cover" data-file-srl="{{file_srl}}" title="Be a cover image"><i class="xi-check-circle"></i></button></span></li>'
};

2
common/js/plugins/spectrum/index.html
View file

@ -19,7 +19,7 @@
<div id='header'>
<h1><a href='http://bgrins.github.com/spectrum'>Spectrum</a></h1> <h2><em>The No Hassle jQuery Colorpicker</em></h2>
<div id='links'>
<a href='http://github.com/bgrins/spectrum/zipball/1.8.0' class="btn btn-primary">Download Zip</a>
<a href='http://github.com/bgrins/spectrum/zipball/1.8.0' class="rhymix_button btn-primary">Download Zip</a>
View the <a href='http://github.com/bgrins/spectrum'>Source code</a>.
Spectrum is a project by <a href='http://twitter.com/bgrins'>@bgrins</a>.
</div>

24
common/js/xml_handler.js
View file

@ -16,9 +16,9 @@
window.show_leaving_warning = true;
/**
* This variable stores the .wfsr jQuery object.
* This variable stores the #rhymix_waiting jQuery object.
*/
var waiting_obj = $(".wfsr");
var waiting_obj = $('#rhymix_waiting');
/**
* Function for compatibility with XE's exec_xml()
@ -56,7 +56,7 @@
// Delay the waiting message for 1 second to prevent rapid blinking.
waiting_obj.css("opacity", 0.0);
var wfsr_timeout = setTimeout(function() {
var waiting_timeout = setTimeout(function() {
if (show_waiting_message) {
waiting_obj.css("opacity", "").show();
}
@ -66,7 +66,7 @@
successHandler = function(data, textStatus, xhr) {
// Hide the waiting message.
clearTimeout(wfsr_timeout);
clearTimeout(waiting_timeout);
waiting_obj.hide().trigger("cancel_confirm");
// Copy data to the result object.
@ -128,7 +128,7 @@
}
// Hide the waiting message and display an error notice.
clearTimeout(wfsr_timeout);
clearTimeout(waiting_timeout);
waiting_obj.hide().trigger("cancel_confirm");
var error_info;
@ -203,7 +203,7 @@
// Delay the waiting message for 1 second to prevent rapid blinking.
waiting_obj.css("opacity", 0.0);
var wfsr_timeout = setTimeout(function() {
var waiting_timeout = setTimeout(function() {
if (show_waiting_message) {
waiting_obj.css("opacity", "").show();
}
@ -213,7 +213,7 @@
var successHandler = function(data, textStatus, xhr) {
// Hide the waiting message.
clearTimeout(wfsr_timeout);
clearTimeout(waiting_timeout);
waiting_obj.hide().trigger("cancel_confirm");
// Add debug information.
@ -263,7 +263,7 @@
// Define the error handler.
var errorHandler = function(xhr, textStatus) {
clearTimeout(wfsr_timeout);
clearTimeout(waiting_timeout);
waiting_obj.hide().trigger("cancel_confirm");
var error_info;
@ -314,7 +314,7 @@
// Delay the waiting message for 1 second to prevent rapid blinking.
waiting_obj.css("opacity", 0.0);
var wfsr_timeout = setTimeout(function() {
var waiting_timeout = setTimeout(function() {
if (show_waiting_message) {
waiting_obj.css("opacity", "").show();
}
@ -322,7 +322,7 @@
// Define the success handler.
var successHandler = function(data, textStatus, xhr) {
clearTimeout(wfsr_timeout);
clearTimeout(waiting_timeout);
waiting_obj.hide().trigger("cancel_confirm");
if (self && self[type]) {
self[type](html);
@ -334,7 +334,7 @@
// Define the error handler.
var errorHandler = function(xhr, textStatus) {
clearTimeout(wfsr_timeout);
clearTimeout(waiting_timeout);
waiting_obj.hide().trigger("cancel_confirm");
var error_info = xhr.status + " " + xhr.statusText + " (" + textStatus + ")";
alert("AJAX communication error while requesting " + params.module + "." + params.act + "\n\n" + error_info);
@ -367,7 +367,7 @@
* Register the beforeUnload handler.
*/
$(function() {
waiting_obj = $(".wfsr");
waiting_obj = $('#rhymix_waiting');
if (show_leaving_warning) {
$(document).ajaxStart(function() {
$(window).bind("beforeunload", beforeUnloadHandler);

2
layouts/xedition/layout.html
View file

@ -165,7 +165,7 @@
<div class="container {$_container_class} {$menutype_class}">
<!-- HEADER -->
<div class="header_wrap xe-clearfix">
<div class="header_wrap rhymix_clearfix">
<div cond="$layout_info->enable_intergration_search === 'Y'" class="search_wrap">
<div class="search_area">
<!-- SEARCH -->

2
modules/addon/tpl/addon_list.html
View file

@ -8,7 +8,7 @@
<input type="hidden" name="sccess_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="xe_validator_id" value="modules/addon/tpl/addon_list/1" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/addon/tpl/addon_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/addon/tpl/addon_list/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<table class="x_table x_table-striped x_table-hover dsTg">

8
modules/addon/tpl/setup_addon.html
View file

@ -31,10 +31,10 @@
</tr>
</tbody>
</table>
<div cond="Context::isBlacklistedPlugin($addon_info->addon_name)" class="message error">
<div cond="Context::isBlacklistedPlugin($addon_info->addon_name)" class="rhymix_message error">
<p><em class="x_label x_label-important">{$lang->msg_warning}</em> {$lang->msg_blacklisted_module}<br />{$lang->get('admin.msg_blacklisted_reason.'.$addon_info->addon_name)}</p>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/addon/tpl/setup_addon/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/addon/tpl/setup_addon/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" method="post" class="x_form-horizontal">
@ -65,7 +65,7 @@
</div>
</block>
</block>
<div cond="!count($addon_info->extra_vars)" class="message info">
<div cond="!count($addon_info->extra_vars)" class="rhymix_message info">
<p>{$lang->msg_not_exist_option}</p>
</div>
</section>
@ -106,7 +106,7 @@
</block>
</block>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

6
modules/admin/tpl/admin_setup.html
View file

@ -2,7 +2,7 @@
<div class="x_page-header">
<h1>{$lang->admin_setup} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_admin" target="_blank">{$lang->help}</a></h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/admin_setup/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/admin_setup/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -29,7 +29,7 @@
<input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" placeholder="Rhymix Admin" />
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
@ -60,7 +60,7 @@
</ul>
</li>
</ul>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-left">
<button value="procAdminMenuReset" name="act" type="submit" class="x_btn">{$lang->cmd_reset}</button>
</div>

4
modules/admin/tpl/config_advanced.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_advanced/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_advanced/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -216,7 +216,7 @@
<label for="use_gzip_n" class="x_inline"><input type="radio" name="use_gzip" id="use_gzip_n" value="N" checked="checked"|cond="!$use_gzip" /> {$lang->cmd_no}</label>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_debug.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_debug/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_debug/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -92,7 +92,7 @@
<label for="debug_write_error_log_none" class="x_inline"><input type="radio" name="debug_write_error_log" id="debug_write_error_log_none" value="none" checked="checked"|cond="$debug_write_error_log=='none'" /> {$lang->debug_write_error_log_none}</label>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_domains.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_domains/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_domains/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -101,7 +101,7 @@
<p class="x_help-block">{$lang->about_use_sso}</p>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_domains_edit.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_domains_edit/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_domains_edit/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -152,7 +152,7 @@
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_ftp.html
View file

@ -3,7 +3,7 @@
<div class="x_page-header">
<h1>{$lang->menu_gnb_sub['adminConfigurationFtp']} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_ftp" target="_blank">{$lang->help}</a></h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_ftp/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_ftp/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" id="ftp_form" method="post" class="x_form-horizontal" ruleset="installFtpInfo">
@ -66,7 +66,7 @@
</div>
</div>
</section>
<div class="btnArea" style="margin-top:0">
<div class="rhymix_button_wrapper" style="margin-top:0">
<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-primary x_pull-right" />
</div>
</form>

4
modules/admin/tpl/config_notification.html
View file

@ -1,6 +1,6 @@
<include target="config_header.html" />
<load target="js/notification_config.js" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_notification/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_notification/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -333,7 +333,7 @@
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_security.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_security/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_security/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -39,7 +39,7 @@
<p class="x_help-block">{$lang->about_admin_ip_deny}</p>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_seo.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_seo/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_seo/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -77,7 +77,7 @@
<label for="og_use_timestamps_n" class="x_inline"><input type="radio" name="og_use_timestamps" id="og_use_timestamps_n" value="N" checked="checked"|cond="!$og_use_timestamps" /> {$lang->cmd_no}</label>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

4
modules/admin/tpl/config_sitelock.html
View file

@ -1,5 +1,5 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_sitelock/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_sitelock/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -37,7 +37,7 @@
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>

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

@ -169,9 +169,6 @@ body>.x,
height: 24px;
padding: 0 6px;
}
.x .btn {
color: #333;
}
.x .x_btn {
border-radius: 2px;
overflow: visible;
@ -556,7 +553,7 @@ margin-bottom: 10px;
.x .nowr {
white-space: nowrap;
}
.x .btnArea {
.x .rhymix_button_wrapper {
padding: 10px 0;
margin: 10px 0;
border-top: 1px solid #ccc;
@ -564,7 +561,7 @@ margin-bottom: 10px;
zoom: 1;
clear: both;
}
.x .btnArea:after {
.x .rhymix_button_wrapper:after {
content: "";
display: block;
clear: both;

12
modules/admin/tpl/index.html
View file

@ -11,20 +11,20 @@
<h1>{$lang->control_panel} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_dashboard" target="_blank">{$lang->help}</a></h1>
</div>
<div id="checkBrowserMessage" class="message error" style="display:none;">
<div id="checkBrowserMessage" class="rhymix_message error" style="display:none;">
<h2>{$lang->checkBrowserIE8}</h2>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/index/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="message error" cond="$db_info->use_sitelock == 'Y'">
<div class="rhymix_message error" cond="$db_info->use_sitelock == 'Y'">
<h2>{$lang->sitelock_in_use}</h2>
<p>{$lang->about_sitelock_in_use} <a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigSitelock')}">{$lang->cmd_configure}</a></p>
</div>
<div class="message update" cond="$addTables || $needUpdate">
<div class="rhymix_message update" cond="$addTables || $needUpdate">
<h2>{$lang->need_complete_configuration}</h2>
<p>{$lang->need_complete_configuration_details}</p>
<ul>
@ -41,7 +41,7 @@
</ul>
</div>
<div class="message update" cond="count($newVersionList)">
<div class="rhymix_message update" cond="count($newVersionList)">
<h2>{$lang->available_new_version}</h2>
<p>{$lang->available_new_version_details}</p>
<ul>
@ -61,7 +61,7 @@
</block>
</div>
<div class="message error" cond="version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<')">
<div class="rhymix_message error" cond="version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<')">
<h2>{$lang->msg_php_warning_title}</h2>
<p>{$lang->msg_php_warning_notice}</p>
<p>{$lang->msg_php_warning_now_version} : <strong>{phpversion()}</strong></p>

2
modules/admin/tpl/layout.html
View file

@ -1,6 +1,6 @@
<include target="./_header.html" />
<div class="content" id="content">
<div cond="Context::isBlacklistedPlugin($blacklisted_plugin_name = strtolower(preg_replace('/^disp([A-Z][a-z0-9_]+)[A-Z].+$/', '$1', $act)))" class="message error" style="margin-top:15px">
<div cond="Context::isBlacklistedPlugin($blacklisted_plugin_name = strtolower(preg_replace('/^disp([A-Z][a-z0-9_]+)[A-Z].+$/', '$1', $act)))" class="rhymix_message error" style="margin-top:15px">
<p>
<em class="x_label x_label-important">{$lang->msg_warning}</em> {$lang->msg_blacklisted_module}<br />
{$lang->get('admin.msg_blacklisted_reason.'.$blacklisted_plugin_name)}

4
modules/advanced_mailer/tpl/config.html
View file

@ -7,7 +7,7 @@
<input type="hidden" name="act" value="procAdvanced_mailerAdminInsertConfig" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -77,7 +77,7 @@
</section>
<div class="btnArea x_clearfix">
<div class="rhymix_button_wrapper x_clearfix">
<button type="submit" class="x_btn x_btn-primary x_pull-right">{$lang->cmd_registration}</button>
</div>

4
modules/advanced_mailer/tpl/exceptions.html
View file

@ -6,7 +6,7 @@
<input type="hidden" name="act" value="procAdvanced_mailerAdminInsertExceptions" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -60,7 +60,7 @@
※ {$lang->cmd_advanced_mailer_about_exception_domains}
</div>
<div class="btnArea x_clearfix">
<div class="rhymix_button_wrapper x_clearfix">
<button type="submit" class="x_btn x_btn-primary x_pull-right">{$lang->cmd_registration}</button>
</div>

4
modules/advanced_mailer/tpl/mail_test.html
View file

@ -7,7 +7,7 @@
<input type="hidden" name="act" value="procAdvanced_mailerAdminTestSendMail" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -38,7 +38,7 @@
</section>
<div class="btnArea x_clearfix">
<div class="rhymix_button_wrapper x_clearfix">
<button id="advanced_mailer_test_send_mail" type="submit" class="x_btn x_btn-primary x_pull-right">{$lang->cmd_advanced_mailer_send}</button>
</div>

4
modules/advanced_mailer/tpl/sms_test.html
View file

@ -7,7 +7,7 @@
<input type="hidden" name="act" value="procAdvanced_mailerAdminTestSendSMS" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -41,7 +41,7 @@
</section>
<div class="btnArea x_clearfix">
<div class="rhymix_button_wrapper x_clearfix">
<button id="advanced_mailer_test_send_sms" type="submit" class="x_btn x_btn-primary x_pull-right">{$lang->cmd_advanced_mailer_send}</button>
</div>

2
modules/autoinstall/tpl/index.html
View file

@ -6,7 +6,7 @@
'modules/autoinstall/tpl/uninstall/1' => 1
);
}
<div cond="$XE_VALIDATOR_MESSAGE && isset($from_id[$XE_VALIDATOR_ID])" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && isset($from_id[$XE_VALIDATOR_ID])" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<!--

6
modules/autoinstall/tpl/install.html
View file

@ -3,7 +3,7 @@
<h2>{$package->title} ver. {$package->version}</h2>
<div class="message error" cond="version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<')">
<div class="rhymix_message error" cond="version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<')">
<h2>안전하지 않은 PHP 버전 경고</h2>
<p>이 서버는 안전하지 않은 PHP 버전을 사용하고 있으며, PHP를 최신 안정 버전으로의 업그레이드를 권장합니다.</p>
<p>이 서버의 PHP 버전 : <strong>{phpversion()}</strong></p>
@ -54,7 +54,7 @@
</block>
</div>
<div cond="!$show_ftp_note">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/install/1'" class="message error">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/install/1'" class="rhymix_message error">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" class="x_form-horizontal" method="post" ruleset="ftp">
@ -74,7 +74,7 @@
</div>
</div>
</block>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<input class="x_btn x_btn-primary" type="submit" value="{$package->installed?$lang->update:$lang->install}" />
</div>

4
modules/autoinstall/tpl/js/waiting.js
View file

@ -1,10 +1,10 @@
(function($){
var WaitingStub = xe.createPlugin('waiting_stub', {
API_BEFORE_VALIDATE : function(sender, params) {
$('.wfsr').html(waiting_message).show();
$('#rhymix_waiting').html(waiting_message).show();
},
API_BEFORE_SHOW_ALERT : function(sender, params) {
$('.wfsr').hide();
$('#rhymix_waiting').hide();
}
});

4
modules/autoinstall/tpl/uninstall.html
View file

@ -21,7 +21,7 @@
</div>
<div cond="!$show_ftp_note">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/uninstall/1'" class="message error">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/uninstall/1'" class="rhymix_message error">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" class="x_form-horizontal" method="post" ruleset="ftp">
@ -41,7 +41,7 @@
</div>
</div>
</block>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_delete}" />
</div>

4
modules/board/m.skins/default/comment.html
View file

@ -21,9 +21,9 @@
<em>{$comment->getNickName()}</em>
<span class="time">{$comment->getRegdate("Y.m.d")}</span>
<!--@if($comment->isGranted() || !$comment->get('member_srl'))-->
<a href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="btn de">{$lang->cmd_delete}</a>
<a href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="rhymix_button de">{$lang->cmd_delete}</a>
<!--@endif-->
<a href="{getUrl('act','dispBoardReplyComment','comment_srl',$comment->comment_srl)}" class="btn re">{$lang->cmd_reply}</a>
<a href="{getUrl('act','dispBoardReplyComment','comment_srl',$comment->comment_srl)}" class="rhymix_button re">{$lang->cmd_reply}</a>
{@ $start = false }
{@ $depth = $comment->get('depth') }
</span>

10
modules/board/m.skins/default/css/mboard.css
View file

@ -51,7 +51,7 @@ input[type=radio] {
/* Background */
.rp li li,
.rp .answer,
.rp .btn,
.rp .rhymix_button,
.hx .write {
background-image: url(../img/mx.png);
background-repeat: no-repeat;
@ -376,7 +376,7 @@ input[type=radio] {
padding-left: 85px;
background-position: 70px -145px;
}
.rp .btn {
.rp .rhymix_button {
display: inline-block;
width: 15px !important;
height: 15px !important;
@ -386,13 +386,13 @@ input[type=radio] {
vertical-align: middle;
text-indent: 15px;
}
.rp .btn.ed {
.rp .rhymix_button.ed {
background-position: 0 -32px;
}
.rp .btn.de {
.rp .rhymix_button.de {
background-position: -15px -32px;
}
.rp .btn.re {
.rp .rhymix_button.re {
background-position: -30px -32px;
}
.rp .auth {

2
modules/board/m.skins/default/read.html
View file

@ -57,7 +57,7 @@
<em>{htmlspecialchars($val->title)} - {htmlspecialchars($val->blog_name)}</em>
<span class="time">{zdate($val->regdate, "Y.m.d")}</span>
<!--@if($grant->manager)-->
<a href="07_password.html" class="btn de">{$lang->cmd_delete}</a>
<a href="07_password.html" class="rhymix_button de">{$lang->cmd_delete}</a>
<!--@endif-->
</span>
</li>

2
modules/board/m.skins/simpleGray/css/mboard.css
View file

@ -515,7 +515,7 @@ select {
margin-right: 10px;
}
.btn {
.rhymix_button {
display: inline-block;
padding: 5px 10px;
font-weight: normal;

12
modules/board/skins/default/_comment.html
View file

@ -11,14 +11,14 @@
<h3 class="author">
<a cond="$comment->member_srl <= 0 && $comment->homepage" href="{$comment->getHomepageUrl()}">{$comment->getNickName()}</a>
<strong cond="$comment->member_srl <= 0 && !$comment->homepage">{$comment->getNickName()}</strong>
<a cond="$comment->member_srl > 0" href="#popup_menu_area" class="member_{$comment->member_srl}" onclick="return false">{$comment->getNickName()}</a>
<a cond="$comment->member_srl > 0" href="#rhymix_popup_menu" class="member_{$comment->member_srl}" onclick="return false">{$comment->getNickName()}</a>
</h3>
<p class="time">{$comment->getRegdate('Y.m.d H:i')}</p>
</div>
<!--@if(!$comment->isAccessible())-->
<form action="./" method="get" class="xe_content" onsubmit="return procFilter(this, input_password)">
<p><label for="cpw_{$comment->comment_srl}">{$lang->msg_is_secret} {$lang->msg_input_password}</label></p>
<p><input type="password" name="password" id="cpw_{$comment->comment_srl}" class="iText" /><input type="submit" class="btn" value="{$lang->cmd_input}" /></p>
<p><input type="password" name="password" id="cpw_{$comment->comment_srl}" class="iText" /><input type="submit" class="rhymix_button" value="{$lang->cmd_input}" /></p>
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$comment->get('document_srl')}" />
@ -45,7 +45,7 @@
<a cond="$oDocument->allowComment()" href="{getUrl('act','dispBoardReplyComment','comment_srl',$comment->comment_srl)}" class="reply">{$lang->cmd_reply}</a>
<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardModifyComment','comment_srl',$comment->comment_srl)}" class="modify">{$lang->cmd_modify}</a>
<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete">{$lang->cmd_delete}</a>
<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#popup_menu_area" onclick="return false">{$lang->cmd_comment_do}</a>
<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#rhymix_popup_menu" onclick="return false">{$lang->cmd_comment_do}</a>
</p>
</li>
</ul>
@ -81,12 +81,12 @@
<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" class="iCheck" />
<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
</div>
<div class="btnArea">
<button type="submit" class="btn">{$lang->cmd_comment_registration}</button>
<div class="rhymix_button_wrapper">
<button type="submit" class="rhymix_button">{$lang->cmd_comment_registration}</button>
</div>
</form>
</div>
<div class="fbFooter">
<a href="{getUrl('document_srl','')}" class="btn">{$lang->cmd_list}</a>
<a href="{getUrl('document_srl','')}" class="rhymix_button">{$lang->cmd_list}</a>
</div>
<!-- /COMMENT -->

14
modules/board/skins/default/_read.html
View file

@ -11,7 +11,7 @@
<p class="meta">
<a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() <= 0 && $oDocument->isExistsHomepage()" href="{$oDocument->getHomepageUrl()}" target="_blank" rel="noopener" class="author">{$oDocument->getNickName()}</a>
<block cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() <= 0 && !$oDocument->isExistsHomepage()">{$oDocument->getNickName()}</block>
<a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() > 0" href="#popup_menu_area" class="member_{$oDocument->get('member_srl')} author" onclick="return false">{$oDocument->getNickName()}</a>
<a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() > 0" href="#rhymix_popup_menu" class="member_{$oDocument->get('member_srl')} author" onclick="return false">{$oDocument->getNickName()}</a>
<span class="sum">
<span class="read">{$lang->readed_count}:{$oDocument->get('readed_count')}</span>
<span class="vote" cond="$oDocument->get('voted_count')!=0">{$lang->cmd_vote}:{$oDocument->get('voted_count')}</span>
@ -37,7 +37,7 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
<p><label for="cpw">{$lang->msg_is_secret} {$lang->msg_input_password}</label></p>
<p><input type="password" name="password" id="cpw" class="iText" /><input type="submit" value="{$lang->cmd_input}" class="btn" />
<p><input type="password" name="password" id="cpw" class="iText" /><input type="submit" value="{$lang->cmd_input}" class="rhymix_button" />
</p>
</form>
<!--@else-->
@ -61,7 +61,7 @@
<a href="{getUrl('search_target','tag','search_keyword',$tag,'document_srl','')}" class="tag" rel="tag">{htmlspecialchars($tag)}</a><span>,</span>
<!--@end-->
</span>
<a class="document_{$oDocument->document_srl} action" href="#popup_menu_area" onclick="return false">{$lang->cmd_document_do}</a>
<a class="document_{$oDocument->document_srl} action" href="#rhymix_popup_menu" onclick="return false">{$lang->cmd_document_do}</a>
<ul class="sns">
<li class="twitter link"><a href="https://twitter.com/">Twitter</a></li>
<li class="facebook link"><a href="https://www.facebook.com/">Facebook</a></li>
@ -89,11 +89,11 @@
<img cond="$oDocument->getProfileImage()" src="{$oDocument->getProfileImage()}" alt="Profile" class="pf" />
<div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div>
</div>
<div class="btnArea">
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}">{$lang->cmd_modify}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}">{$lang->cmd_delete}</a>
<div class="rhymix_button_wrapper">
<a cond="$oDocument->isEditable()" class="rhymix_button" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}">{$lang->cmd_modify}</a>
<a cond="$oDocument->isEditable()" class="rhymix_button" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}">{$lang->cmd_delete}</a>
<span class="etc">
<a href="{getUrl('document_srl','')}" class="btn">{$lang->cmd_list}</a>
<a href="{getUrl('document_srl','')}" class="rhymix_button">{$lang->cmd_list}</a>
</span>
</div>
</div>

8
modules/board/skins/default/board.default.css
View file

@ -249,7 +249,7 @@
display: block;
clear: both;
}
.list_footer .btnArea {
.list_footer .rhymix_button_wrapper {
float: right;
margin: 0;
}
@ -332,7 +332,7 @@
display: block;
clear: both;
}
.write_footer .btnArea {
.write_footer .rhymix_button_wrapper {
float: right;
margin: 0;
}
@ -672,7 +672,7 @@
.read_footer .sign .tx * {
margin: 0;
}
.read_footer .btnArea {
.read_footer .rhymix_button_wrapper {
clear: both;
text-align: right;
padding: 10px 0;
@ -1078,7 +1078,7 @@
font-size: 16px;
margin: 20px 0;
}
.context_message .btnArea {
.context_message .rhymix_button_wrapper {
margin: 20px 0;
}
/* Tag List */

4
modules/board/skins/default/comment_form.html
View file

@ -32,8 +32,8 @@
<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" checked="checked"|cond="$oComment->get('is_secret')=='Y'" class="iCheck" />
<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
</div>
<div class="btnArea">
<button type="submit" class="btn">{$lang->cmd_comment_registration}</button>
<div class="rhymix_button_wrapper">
<button type="submit" class="rhymix_button">{$lang->cmd_comment_registration}</button>
</div>
</form>
</div>

6
modules/board/skins/default/delete_comment_form.html
View file

@ -12,9 +12,9 @@
<input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
<input type="hidden" name="comment_srl" value="{$oComment->get('comment_srl')}" />
<h1>{sprintf($lang->comfirm_act_msg,$lang->comment,$lang->cmd_delete,$lang->msg_eul)}</h1>
<div class="btnArea">
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
<div class="rhymix_button_wrapper">
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />

6
modules/board/skins/default/delete_form.html
View file

@ -10,9 +10,9 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
<h1>{sprintf($lang->comfirm_act_msg,$lang->document,$lang->cmd_delete,$lang->msg_rul)}</h1>
<div class="btnArea">
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
<div class="rhymix_button_wrapper">
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />

6
modules/board/skins/default/delete_trackback_form.html
View file

@ -5,9 +5,9 @@
<input type="hidden" name="document_srl" value="{document_srl}" />
<input type="hidden" name="trackback_srl" value="{$trackback_srl}" />
<h1>{$lang->confirm_delete}</h1>
<div class="btnArea">
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
<div class="rhymix_button_wrapper">
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />

2
modules/board/skins/default/input_password_form.html
View file

@ -6,6 +6,6 @@
<input type="hidden" name="comment_srl" value="{$comment_srl}" />
<h1>{$lang->msg_input_password}</h1>
<input type="password" name="password" title="{$lang->password}" class="iText" />
<input type="submit" class="btn" value="{$lang->cmd_input}" />
<input type="submit" class="rhymix_button" value="{$lang->cmd_input}" />
</form>
<include target="_footer.html" />

14
modules/board/skins/default/list.html
View file

@ -49,7 +49,7 @@
[{$document->getTrackbackCount()}]
</a>
</td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#rhymix_popup_menu" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='user_id' && $val->idx==-1">{$document->getUserID()}</td>
<td class="author" cond="$val->type=='user_name' && $val->idx==-1">{$document->getUserName()}</td>
<td class="time" cond="$val->type=='regdate' && $val->idx==-1">{$document->getRegdate('Y.m.d')}</td>
@ -87,7 +87,7 @@
<a cond="$document->getTrackbackCount()" href="{getUrl('document_srl', $document->document_srl)}#trackback" class="trackbackNum" title="Trackbacks">[{$document->getTrackbackCount()}]</a>
{$document->printExtraImages(60*60*$module_info->duration_new)}
</td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#rhymix_popup_menu" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='user_id' && $val->idx==-1">{$document->getUserID()}</td>
<td class="author" cond="$val->type=='user_name' && $val->idx==-1">{$document->getUserName()}</td>
<td class="time" cond="$val->type=='regdate' && $val->idx==-1">{$document->getRegdate('Y.m.d')}</td>
@ -124,9 +124,9 @@
</block>
<a href="{getUrl('page',$page_navigation->last_page,'document_srl','','division',$division,'last_division',$last_division)}" class="direction next">{$lang->last_page} <span></span><span></span></a>
</div>
<div class="btnArea">
<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn">{$lang->cmd_write}</a>
<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
<div class="rhymix_button_wrapper">
<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="rhymix_button">{$lang->cmd_write}</a>
<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="rhymix_button" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
</div>
<button type="button" class="bsToggle" title="{$lang->cmd_search}">{$lang->cmd_search}</button>
<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
@ -137,8 +137,8 @@
<select name="search_target">
<option loop="$search_option=>$key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
</select>
<button type="submit" class="btn" onclick="xGetElementById('board_search').submit();return false;">{$lang->cmd_search}</button>
<a cond="$last_division" href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="btn">{$lang->cmd_search_next}</a>
<button type="submit" class="rhymix_button" onclick="xGetElementById('board_search').submit();return false;">{$lang->cmd_search}</button>
<a cond="$last_division" href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="rhymix_button">{$lang->cmd_search_next}</a>
</form>
<a href="{getUrl('act','dispBoardTagList')}" class="tagSearch" title="{$lang->tag}">{$lang->tag}</a>
</div>

6
modules/board/skins/default/message.html
View file

@ -1,9 +1,9 @@
<include target="_header.html" />
<div class="context_message">
<h1>{$message}</h1>
<div class="btnArea">
<a cond="!$is_logged" class="btn" href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a>
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_back}</button>
<div class="rhymix_button_wrapper">
<a cond="!$is_logged" class="rhymix_button" href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a>
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_back}</button>
</div>
</div>
<include target="_footer.html" />

2
modules/board/skins/default/tag_list.html
View file

@ -22,6 +22,6 @@
<!--@end-->
</div>
<div class="tagFooter">
<a href="{getUrl('act','')}" class="btn">{$lang->cmd_back}</a>
<a href="{getUrl('act','')}" class="rhymix_button">{$lang->cmd_back}</a>
</div>
<include target="_footer.html" />

8
modules/board/skins/default/write_form.html
View file

@ -68,11 +68,11 @@
<input type="text" name="tags" id="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="iText" style="width:300px" title="Tag" />
</span>
</div>
<div class="btnArea">
<input type="submit" value="{$lang->cmd_registration}" class="btn" />
<div class="rhymix_button_wrapper">
<input type="submit" value="{$lang->cmd_registration}" class="rhymix_button" />
<block cond="!$oDocument->isExists() || $oDocument->get('status') == 'TEMP'">
<button cond="$is_logged" class="btn" type="button" onclick="doDocumentSave(this);">{$lang->cmd_temp_save}</button>
<button cond="$is_logged" class="btn" type="button" onclick="doDocumentLoad(this);">{$lang->cmd_load}</button>
<button cond="$is_logged" class="rhymix_button" type="button" onclick="doDocumentSave(this);">{$lang->cmd_temp_save}</button>
<button cond="$is_logged" class="rhymix_button" type="button" onclick="doDocumentLoad(this);">{$lang->cmd_load}</button>
</block>
</div>
</div>

6
modules/board/skins/xedition/_comment.html
View file

@ -11,14 +11,14 @@
<h3 class="author">
<a cond="$comment->member_srl <= 0 && $comment->homepage" href="{$comment->getHomepageUrl()}">{$comment->getNickName()}</a>
<strong cond="$comment->member_srl <= 0 && !$comment->homepage">{$comment->getNickName()}</strong>
<a cond="$comment->member_srl > 0" href="#popup_menu_area" class="member_{$comment->member_srl}" onclick="return false">{$comment->getNickName()}</a>
<a cond="$comment->member_srl > 0" href="#rhymix_popup_menu" class="member_{$comment->member_srl}" onclick="return false">{$comment->getNickName()}</a>
</h3>
<p class="time">{$comment->getRegdate('Y.m.d H:i')}</p>
</div>
<!--@if(!$comment->isAccessible())-->
<form action="./" method="get" class="xe_content secretForm" onsubmit="return procFilter(this, input_password)">
<p><label for="cpw_{$comment->comment_srl}">{$lang->msg_is_secret} {$lang->msg_input_password}</label></p>
<p><input type="password" name="password" id="cpw_{$comment->comment_srl}" class="iText" /><input type="submit" class="btn" value="{$lang->cmd_input}" /></p>
<p><input type="password" name="password" id="cpw_{$comment->comment_srl}" class="iText" /><input type="submit" class="rhymix_button" value="{$lang->cmd_input}" /></p>
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$comment->get('document_srl')}" />
@ -42,7 +42,7 @@
<a cond="$oDocument->allowComment()" href="{getUrl('act','dispBoardReplyComment','comment_srl',$comment->comment_srl)}" class="reply"><i class="xi-reply"></i> {$lang->cmd_reply}</a>
<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardModifyComment','comment_srl',$comment->comment_srl)}" class="modify"><i class="xi-eraser"></i> {$lang->cmd_modify}</a>
<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->cmd_delete}</a>
<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#popup_menu_area" onclick="return false">{$lang->cmd_comment_do}</a>
<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#rhymix_popup_menu" onclick="return false">{$lang->cmd_comment_do}</a>
</p>
<p class="action" cond="$comment->isDeleted()">
<a cond="$grant->manager" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->delete_placeholder}</a>

18
modules/board/skins/xedition/_read.html
View file

@ -9,7 +9,7 @@
<span class="author">
<i class="xi-user"></i><a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() <= 0 && $oDocument->isExistsHomepage()" href="{$oDocument->getHomepageUrl()}" target="_blank" rel="noopener" class="author">{$oDocument->getNickName()}</a>
<block cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() <= 0 && !$oDocument->isExistsHomepage()">{$oDocument->getNickName()}</block>
<a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() > 0" href="#popup_menu_area" class="member_{$oDocument->get('member_srl')} author" onclick="return false">{$oDocument->getNickName()}</a>
<a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl() > 0" href="#rhymix_popup_menu" class="member_{$oDocument->get('member_srl')} author" onclick="return false">{$oDocument->getNickName()}</a>
</span>
<span class="time">
<i class="xi-time"></i> {$oDocument->getRegdate('Y.m.d H:i')}
@ -41,7 +41,7 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
<p><label for="cpw">{$lang->msg_is_secret} {$lang->msg_input_password}</label></p>
<p><input type="password" name="password" id="cpw" class="iText" /><input type="submit" value="{$lang->cmd_input}" class="btn" />
<p><input type="password" name="password" id="cpw" class="iText" /><input type="submit" value="{$lang->cmd_input}" class="rhymix_button" />
</p>
</form>
<!--@else-->
@ -107,19 +107,19 @@
<a href="{getUrl('search_target','tag','search_keyword',$tag,'document_srl','')}" class="tag" rel="tag">{htmlspecialchars($tag)}</a><span>,</span>
<!--@end-->
</span>
<a class="document_{$oDocument->document_srl} action" href="#popup_menu_area" onclick="return false">{$lang->cmd_document_do}</a>
<a class="document_{$oDocument->document_srl} action" href="#rhymix_popup_menu" onclick="return false">{$lang->cmd_document_do}</a>
</div>
<div class="sign" cond="$module_info->display_sign!='N'&&($oDocument->getProfileImage()||$oDocument->getSignature())">
<img cond="$oDocument->getProfileImage()" src="{$oDocument->getProfileImage()}" alt="Profile" class="pf" />
<div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div>
</div>
<div class="btnArea">
<a class="btn" href="{getUrl('act','dispBoardVoteLog','target_srl',$oDocument->document_srl,'target','document')}"><i class="xi-list-ul"></i>{$lang->cmd_document_vote_user}</a>
<a cond="$update_view" class="btn" href="{getUrl('act','dispBoardUpdateLog','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-list-ul"></i>{$lang->update_log}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a>
<div class="rhymix_button_wrapper">
<a class="rhymix_button" href="{getUrl('act','dispBoardVoteLog','target_srl',$oDocument->document_srl,'target','document')}"><i class="xi-list-ul"></i>{$lang->cmd_document_vote_user}</a>
<a cond="$update_view" class="rhymix_button" href="{getUrl('act','dispBoardUpdateLog','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-list-ul"></i>{$lang->update_log}</a>
<a cond="$oDocument->isEditable()" class="rhymix_button" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a>
<a cond="$oDocument->isEditable()" class="rhymix_button" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a>
<span class="etc">
<a href="{getUrl('document_srl','')}" class="btn"><i class="xi-list-ul-l"></i>{$lang->cmd_list}</a>
<a href="{getUrl('document_srl','')}" class="rhymix_button"><i class="xi-list-ul-l"></i>{$lang->cmd_list}</a>
</span>
</div>
</div>

8
modules/board/skins/xedition/board.default.css
View file

@ -222,7 +222,7 @@
display: block;
clear: both;
}
.list_footer .btnArea {
.list_footer .rhymix_button_wrapper {
float: right;
margin: 0;
}
@ -306,7 +306,7 @@
display: block;
clear: both;
}
.write_footer .btnArea {
.write_footer .rhymix_button_wrapper {
float: right;
margin: 0;
}
@ -626,7 +626,7 @@
.read_footer .sign .tx * {
margin: 0;
}
.read_footer .btnArea {
.read_footer .rhymix_button_wrapper {
clear: both;
text-align: right;
padding: 10px 0;
@ -1025,7 +1025,7 @@
font-size: 16px;
margin: 20px 0;
}
.context_message .btnArea {
.context_message .rhymix_button_wrapper {
margin: 20px 0;
}
/* Tag List */

6
modules/board/skins/xedition/delete_comment_form.html
View file

@ -13,13 +13,13 @@
<input type="hidden" name="comment_srl" value="{$oComment->get('comment_srl')}" />
<h1>{sprintf($lang->comfirm_act_msg,$lang->comment,$lang->cmd_delete,$lang->msg_eul)}</h1>
<div class="btnArea">
<div class="rhymix_button_wrapper">
<label for="instant_delete" cond="$grant->manager" style="line-height: 24px;">
<input type="checkbox" id="instant_delete" name="instant_delete" value="Y" cond="$grant->manager" checked="checked"|cond="$oComment->status >= 7" style="vertical-align: middle;" />
{$lang->delete_placeholder}
</label>
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />

6
modules/board/skins/xedition/delete_form.html
View file

@ -10,9 +10,9 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
<h1>{sprintf($lang->comfirm_act_msg,$lang->document,$lang->cmd_delete,$lang->msg_rul)}</h1>
<div class="btnArea">
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
<div class="rhymix_button_wrapper">
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />

6
modules/board/skins/xedition/delete_trackback_form.html
View file

@ -5,9 +5,9 @@
<input type="hidden" name="document_srl" value="{document_srl}" />
<input type="hidden" name="trackback_srl" value="{$trackback_srl}" />
<h1>{$lang->confirm_delete}</h1>
<div class="btnArea">
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
<div class="rhymix_button_wrapper">
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_cancel}</button>
</div>
</form>
<include target="_footer.html" />

2
modules/board/skins/xedition/input_password_form.html
View file

@ -6,6 +6,6 @@
<input type="hidden" name="comment_srl" value="{$comment_srl}" />
<h1>{$lang->msg_input_password}</h1>
<input type="password" name="password" title="{$lang->password}" class="iText" />
<input type="submit" class="btn" value="{$lang->cmd_input}" />
<input type="submit" class="rhymix_button" value="{$lang->cmd_input}" />
</form>
<include target="_footer.html" />

18
modules/board/skins/xedition/list.html
View file

@ -57,7 +57,7 @@
[{$document->getTrackbackCount()}]
</a>
</td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#rhymix_popup_menu" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='user_id' && $val->idx==-1">{$document->getUserID()}</td>
<td class="author" cond="$val->type=='user_name' && $val->idx==-1">{$document->getUserName()}</td>
<td class="time" cond="$val->type=='regdate' && $val->idx==-1">{$document->getRegdate('Y.m.d')}</td>
@ -95,7 +95,7 @@
<a cond="$document->getTrackbackCount()" href="{getUrl('document_srl', $document->document_srl)}#trackback" class="trackbackNum" title="Trackbacks">[{$document->getTrackbackCount()}]</a>
{$document->printExtraImages(60*60*$module_info->duration_new)}
</td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#rhymix_popup_menu" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
<td class="author" cond="$val->type=='user_id' && $val->idx==-1">{$document->getUserID()}</td>
<td class="author" cond="$val->type=='user_name' && $val->idx==-1">{$document->getUserName()}</td>
<td class="time" cond="$val->type=='regdate' && $val->idx==-1">{$document->getRegdate('Y.m.d')}</td>
@ -125,11 +125,11 @@
</div>
<div class="list_footer">
<div class="btnArea">
<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn"><i class="xi-pen"></i> {$lang->cmd_write}</a>
<a href="{getUrl('act','dispBoardTagList')}" class="btn" title="{$lang->tag}"><i class="xi-tag"></i> {$lang->tag}</a>
<a cond="$grant->manager" class="btn" href="{getUrl('act','dispBoardAdminBoardInfo')}" title="{$lang->cmd_setup}"><i class="xi-cog"></i> {$lang->cmd_setup}</a>
<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
<div class="rhymix_button_wrapper">
<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="rhymix_button"><i class="xi-pen"></i> {$lang->cmd_write}</a>
<a href="{getUrl('act','dispBoardTagList')}" class="rhymix_button" title="{$lang->tag}"><i class="xi-tag"></i> {$lang->tag}</a>
<a cond="$grant->manager" class="rhymix_button" href="{getUrl('act','dispBoardAdminBoardInfo')}" title="{$lang->cmd_setup}"><i class="xi-cog"></i> {$lang->cmd_setup}</a>
<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="rhymix_button" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
</div>
<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
@ -143,8 +143,8 @@
<i class="xi-magnifier"></i>
<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" class="iText" />
</div>
<button type="submit" class="btn" onclick="xGetElementById('board_search').submit();return false;">{$lang->cmd_search}</button>
<a cond="$last_division" href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="btn">{$lang->cmd_search_next}</a>
<button type="submit" class="rhymix_button" onclick="xGetElementById('board_search').submit();return false;">{$lang->cmd_search}</button>
<a cond="$last_division" href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="rhymix_button">{$lang->cmd_search_next}</a>
</form>
<div class="pagination" cond="$document_list || $notice_list">

6
modules/board/skins/xedition/message.html
View file

@ -1,9 +1,9 @@
<include target="_header.html" />
<div class="context_message">
<h1>{$message}</h1>
<div class="btnArea">
<a cond="!$is_logged" class="btn" href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a>
<button type="button" class="btn" onclick="history.back()">{$lang->cmd_back}</button>
<div class="rhymix_button_wrapper">
<a cond="!$is_logged" class="rhymix_button" href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a>
<button type="button" class="rhymix_button" onclick="history.back()">{$lang->cmd_back}</button>
</div>
</div>
<include target="_footer.html" />

2
modules/board/skins/xedition/tag_list.html
View file

@ -22,6 +22,6 @@
<!--@end-->
</div>
<div class="tagFooter">
<a href="{getUrl('act','')}" class="btn">{$lang->cmd_back}</a>
<a href="{getUrl('act','')}" class="rhymix_button">{$lang->cmd_back}</a>
</div>
<include target="_footer.html" />

2
modules/board/skins/xedition/update_view.html
View file

@ -31,7 +31,7 @@
<input type="hidden" name="module" value="board" />
<input type="hidden" name="act" value="procBoardUpdateDocument" />
<input type="hidden" name="update_id" value="{$update_log->update_id}" />
<button class="btn" type="submit">{$lang->cmd_modify_by_update_log}</button>
<button class="rhymix_button" type="submit">{$lang->cmd_modify_by_update_log}</button>
</form>
</div>
<include target="_footer.html" />

4
modules/board/skins/xedition/vote_log.html
View file

@ -3,11 +3,11 @@
<div class="vote-list">
<h2>추천인</h2>
<block loop="$vote_member_info => $val">
<a href="#popup_menu_area" class="votelog member_{$val->member_srl}" onclick="return false">{$val->nick_name}</a>
<a href="#rhymix_popup_menu" class="votelog member_{$val->member_srl}" onclick="return false">{$val->nick_name}</a>
</block>
<h2>비추천인</h2>
<block loop="$blame_member_info => $val">
<a href="#popup_menu_area" class="votelog member_{$val->member_srl}" onclick="return false">{$val->nick_name}</a>
<a href="#rhymix_popup_menu" class="votelog member_{$val->member_srl}" onclick="return false">{$val->nick_name}</a>
</block>
</div>

4
modules/board/skins/xedition/write_form.html
View file

@ -76,8 +76,8 @@
</div>
<div style="float:right">
<block cond="!$oDocument->isExists() || $oDocument->get('status') == 'TEMP'">
<button cond="$is_logged" class="btn" type="button" onclick="doDocumentSave(this);">{$lang->cmd_temp_save}</button>
<button cond="$is_logged" class="btn" type="button" onclick="doDocumentLoad(this);">{$lang->cmd_load}</button>
<button cond="$is_logged" class="rhymix_button" type="button" onclick="doDocumentSave(this);">{$lang->cmd_temp_save}</button>
<button cond="$is_logged" class="rhymix_button" type="button" onclick="doDocumentLoad(this);">{$lang->cmd_load}</button>
</block>
<button type="submit" class="btn_insert"><i class="xi-pen"></i> {$lang->cmd_registration}</button>
</div>

2
modules/board/tpl/addition_setup.html
View file

@ -1,6 +1,6 @@
<include target="./header.html" />
<!--// no use validator id. -->
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
{$setup_content}

2
modules/board/tpl/board_delete.html
View file

@ -13,7 +13,7 @@
<dt>{$lang->document_count}</dt>
<dd>{$module_info->document_count}</dd>
</dl>
<div class="btnArea">
<div class="rhymix_button_wrapper">
<a href="{getUrl('act','dispBoardAdminContent')}" class="x_btn x_pull-left">{$lang->cmd_back}</a>
<span><input class="x_btn x_btn-danger" type="submit" value="{$lang->cmd_delete}" /></span>
</div>

4
modules/board/tpl/board_insert.html
View file

@ -1,6 +1,6 @@
<include target="header.html" />
<load target="../../module/tpl/js/multi_order.js" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/board/tpl/board_insert/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/board/tpl/board_insert/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="insertBoard" class="x_form-horizontal" action="./" method="post" enctype="multipart/form-data">
@ -364,7 +364,7 @@
</div>
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-left">
<a href="{getUrl('act', 'dispBoardAdminContent')}" type="button" class="x_btn">{$lang->cmd_cancel}</a>
</div>

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

@ -1,5 +1,5 @@
<include target="./header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/board/tpl/category_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/board/tpl/category_list/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
{$category_content}
@ -26,7 +26,7 @@
</div>
</div>
</section>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
</div>

2
modules/board/tpl/index.html
View file

@ -1,6 +1,6 @@
<include target="header.html" />
<!--TODO-->
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == ''" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == ''" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>

2
modules/comment/comment.item.php
View file

@ -429,7 +429,7 @@ class commentItem extends BaseObject
if($add_popup_menu && Context::get('is_logged'))
{
$content = sprintf(
'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, lang('cmd_comment_do')
'%s<div class="comment_popup_menu"><a href="#rhymix_popup_menu" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, lang('cmd_comment_do')
);
}

6
modules/comment/tpl/comment_list.html
View file

@ -3,7 +3,7 @@
xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</script>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/comment_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/comment_list/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form id="fo_list" action="./" method="post">
@ -55,8 +55,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</td>
<td class="nowr">
<span cond="$val->get('member_srl') <= 0">{$val->getNickName()}</span>
<a href="#popup_menu_area" class="member_{abs($val->get('member_srl'))}" cond="$val->get('member_srl') < 0">({$member_nick_name[abs($val->get('member_srl'))]})</a>
<a href="#popup_menu_area" class="member_{$val->get('member_srl')}" cond="$val->get('member_srl') > 0">{$val->getNickName()}</a>
<a href="#rhymix_popup_menu" class="member_{abs($val->get('member_srl'))}" cond="$val->get('member_srl') < 0">({$member_nick_name[abs($val->get('member_srl'))]})</a>
<a href="#rhymix_popup_menu" class="member_{$val->get('member_srl')}" cond="$val->get('member_srl') > 0">{$val->getNickName()}</a>
</td>
<td class="nowr">{number_format($val->get('voted_count'))}/{number_format($val->get('blamed_count'))}</td>
<td class="nowr">{(zdate($val->regdate,"Y-m-d\nH:i:s"))}</td>

2
modules/comment/tpl/comment_module_config.html
View file

@ -49,7 +49,7 @@
<label class="x_inline" for="declared_message_manager"><input type="checkbox" name="declared_message[]" id="declared_message_manager" value="manager" checked="checked"|cond="in_array('manager', $comment_config->declared_message)" /> {$lang->cmd_declared_message_manager}</label>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
</form>

2
modules/comment/tpl/declare_comment.html
View file

@ -26,7 +26,7 @@
<textarea name="declare_message" id="declare_message"></textarea>
<p>{$lang->about_improper_comment_declare}<p>
</div>
<div class="x_clearfix btnArea">
<div class="x_clearfix rhymix_button_wrapper">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary" />{$lang->cmd_submit}</button>
</div>

2
modules/comment/tpl/declared_list.html
View file

@ -1,5 +1,5 @@
<include target="header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/declared_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/declared_list/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="deleteChecked" id="fo_list" action="./" method="post">

6
modules/comment/tpl/declared_log.html
View file

@ -1,5 +1,5 @@
<h1>{$lang->improper_comment_declare}</h1>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/declared_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/declared_list/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form id="fo_list" action="./" method="get">
@ -9,7 +9,7 @@
<section>
<h1>{$lang->replies}</h1>
<p>{$declared_comment->getSummary(200)}</p>
<address cond="$declared_comment->get('member_srl')"><a href="#popup_menu_area" class="member_{$declared_comment->get('member_srl')}">{$declared_comment->getNickName()}</a></address>
<address cond="$declared_comment->get('member_srl')"><a href="#rhymix_popup_menu" class="member_{$declared_comment->get('member_srl')}">{$declared_comment->getNickName()}</a></address>
</section>
</blockquote>
<h2>{$lang->improper_comment_declare_reason}</h2>
@ -23,7 +23,7 @@
</thead>
<tbody>
<tr loop="$declare_log => $no,$log">
<td class="nowr"><a cond="$log->member_srl" href="#popup_menu_area" class="member_{$log->member_srl}">{$reporter_list[$log->member_srl]->nick_name}</a> ({$log->ipaddress})</td>
<td class="nowr"><a cond="$log->member_srl" href="#rhymix_popup_menu" class="member_{$log->member_srl}">{$reporter_list[$log->member_srl]->nick_name}</a> ({$log->ipaddress})</td>
<td class="nowr">{$log->declare_message}</td>
<td class="nowr">{date('Y-m-d H:i:s', strtotime($log->regdate))}</td>
</tr>

10
modules/communication/m.skins/default/css/mcommunication.css
View file

@ -15,7 +15,7 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
/* Background */
.rp li li,
.rp .answer,
.rp .btn,
.rp .rhymix_button,
/* Body */
.bd{background:#f8f8f8;padding:1px 0}
.co{margin:10px;line-height:1.4;font-size:14px;color:#333}
@ -85,10 +85,10 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
.rp li li li li{padding-left:55px;background-position:40px -145px}
.rp li li li li li{padding-left:70px;background-position:55px -145px}
.rp li li li li li li{padding-left:85px;background-position:70px -145px}
.rp .btn{display:inline-block;width:15px;height:15px;overflow:hidden;vertical-align:middle;text-indent:15px}
.rp .btn.ed{background-position:0 -32px}
.rp .btn.de{background-position:-15px -32px}
.rp .btn.re{background-position:-30px -32px}
.rp .rhymix_button{display:inline-block;width:15px;height:15px;overflow:hidden;vertical-align:middle;text-indent:15px}
.rp .rhymix_button.ed{background-position:0 -32px}
.rp .rhymix_button.de{background-position:-15px -32px}
.rp .rhymix_button.re{background-position:-30px -32px}
.rp .auth{font-size:12px}
.rp .auth .time{padding:0 5px;border-left:1px solid #bfbfbf}
/* Form Field */

2
modules/communication/m.skins/default/send_message.html
View file

@ -4,7 +4,7 @@
<div class="hx h2">
<h2>{$lang->cmd_send_message}</h2>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/m.skins/default/send_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/m.skins/default/send_message/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="warning_label warning_label-important" cond="$logged_info->allow_message !== 'Y'">

2
modules/communication/m.skins/rx_prn/friends.html
View file

@ -28,7 +28,7 @@
<input type="hidden" name="xe_validator_id" value="modules/communication/skins/rx_prn/frineds/1" />
<ul class="rx_sw_list">
<li loop="$friend_list => $no,$val">
<a href="#popup_menu_area" class="cont_a member_{$val->target_srl}">
<a href="#rhymix_popup_menu" class="cont_a member_{$val->target_srl}">
<span class="content_basic member_{$val->target_srl}">
<span class="content_title member_{$val->target_srl}">
{escape($val->nick_name)}

2
modules/communication/m.skins/rx_prn/messages.html
View file

@ -5,7 +5,7 @@
<section class="prn-body" cond="$message">
<h1>{escape($message->title)}</h1>
<div>
<a href="popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
<a href="rhymix_popup_menu" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
</div>
<div class="xe_content">
{$message->content}

2
modules/communication/m.skins/rx_prn/new_message.html
View file

@ -4,7 +4,7 @@
<section class="prn-body" cond="$message">
<h1>{escape($message->title)}</h1>
<div>
<a href="popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
<a href="rhymix_popup_menu" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
</div>
<div class="xe_content">
{$message->content}

2
modules/communication/m.skins/rx_prn/send_message.html
View file

@ -24,7 +24,7 @@
<input type="hidden" name="xe_validator_id" value="modules/communication/skins/rx_prn/send_message/1" />
<div class="control-group">
<label for="message_receiver">{$lang->receiver}</label>
<a id="message_receiver" href="#popup_menu_area" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a>
<a id="message_receiver" href="#rhymix_popup_menu" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a>
<label for="message_title">{$lang->title}</label>
<input type="text" name="title" id="message_title" value="{$source_message->title}" />
<label for="message_send_mail"><input type="checkbox" value="Y" name="send_mail" id="message_send_mail" /> {$lang->cmd_send_mail}</label>

8
modules/communication/skins/default/add_friend.html
View file

@ -3,7 +3,7 @@
<load target="js/communication.js" />
<div class="xc">
<h1>{$lang->cmd_add_friend}</h1>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/add_friend/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/add_friend/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="addFriend" action="./" method="post">
@ -23,12 +23,12 @@
<option value="">{$lang->default_friend_group}</option>
<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}">{$val->title}</option>
</select>
<a href="{getUrl('act','dispCommunicationAddFriendGroup')}" class="btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
<a href="{getUrl('act','dispCommunicationAddFriendGroup')}" class="rhymix_button" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
</td>
</tr>
</table>
<div class="btnArea" style="border-top:0;padding:0">
<input type="submit" value="{$lang->cmd_add_friend}" class="btn btn-inverse" />
<div class="rhymix_button_wrapper" style="border-top:0;padding:0">
<input type="submit" value="{$lang->cmd_add_friend}" class="rhymix_button inverse" />
</div>
</form>
</div>

8
modules/communication/skins/default/add_friend_group.html
View file

@ -8,7 +8,7 @@
{$lang->cmd_add_friend_group}
<!--@end-->
</h1>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/add_friend_group/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/add_friend_group/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="addFriendGroup" action="./" method="post" class="form-horizontal">
@ -20,9 +20,9 @@
<label for="title" class="control-label">{$lang->msg_insert_group_name}</label>
<div class="controls"><input name="title" id="title" type="text" value="{htmlspecialchars($friend_group->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}"/></div>
</div>
<div class="btnArea">
<input cond="$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_modify}" class="btn btn-inverse" />
<input cond="!$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_insert}" class="btn btn-inverse" />
<div class="rhymix_button_wrapper">
<input cond="$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_modify}" class="rhymix_button inverse" />
<input cond="!$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_insert}" class="rhymix_button inverse" />
</div>
</form>
</div>

75
modules/communication/skins/default/css/communication.css
View file

@ -140,33 +140,33 @@
.xc .input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc}
.xc .input-append .add-on,
.xc .input-prepend .add-on,
.xc .input-append .btn,
.xc .input-prepend .btn{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.xc .input-append .rhymix_button,
.xc .input-prepend .rhymix_button{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.xc .input-append .active,
.xc .input-prepend .active{background-color:#a9dba9;border-color:#46a546}
.xc .input-prepend .add-on,
.xc .input-prepend .btn{margin-right:-1px}
.xc .input-prepend .rhymix_button{margin-right:-1px}
.xc .input-prepend .add-on:first-child,
.xc .input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}
.xc .input-prepend .rhymix_button:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}
.xc .input-append input,
.xc .input-append select{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}
.xc .input-append input+.btn-group .btn:last-child,
.xc .input-append select+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-append input+.rhymix_button_group .rhymix_button:last-child,
.xc .input-append select+.rhymix_button_group .rhymix_button:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-append .add-on,
.xc .input-append .btn,
.xc .input-append .btn-group{margin-left:-1px}
.xc .input-append .rhymix_button,
.xc .input-append .rhymix_button_group{margin-left:-1px}
.xc .input-append .add-on:last-child,
.xc .input-append .btn:last-child,
.xc .input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-append .rhymix_button:last-child,
.xc .input-append .rhymix_button_group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-prepend.input-append input,
.xc .input-prepend.input-append select{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.xc .input-prepend.input-append input+.btn-group .btn,
.xc .input-prepend.input-append select+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-prepend.input-append input+.rhymix_button_group .rhymix_button,
.xc .input-prepend.input-append select+.rhymix_button_group .rhymix_button{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-prepend.input-append .add-on:first-child,
.xc .input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}
.xc .input-prepend.input-append .rhymix_button:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}
.xc .input-prepend.input-append .add-on:last-child,
.xc .input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-prepend.input-append .btn-group:first-child{margin-left:0}
.xc .input-prepend.input-append .rhymix_button:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}
.xc .input-prepend.input-append .rhymix_button_group:first-child{margin-left:0}
.xc .form-horizontal input,
.xc .form-horizontal textarea,
.xc .form-horizontal select,
@ -233,49 +233,6 @@
.xc .pagination ul>li:last-child>a,
.xc .pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}
.xc .pagination-centered{text-align:center}
/* Button */
.xc .btn{font-size:12px;font-family:inherit;display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;line-height:20px;height:auto;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;border:1px solid #cccccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)}
.xc .btn:hover,
.xc .btn:focus,
.xc .btn:active,
.xc .btn.active,
.xc .btn.disabled,
.xc .btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9}
.xc .btn:active,
.xc .btn.active{background-color:#cccccc \9}
.xc .btn:first-child{*margin-left:0}
.xc .btn:hover,
.xc .btn:focus{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear}
.xc .btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}
.xc .btn.active,
.xc .btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}
.xc .btn.disabled,
.xc .btn[disabled]{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}
.xc .btn-inverse.active{color:rgba(255, 255, 255, 0.75)}
.xc .btn-inverse{color:#ffffff!important;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#363636;*background-color:#222222;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
.xc .btn-inverse:hover,
.xc .btn-inverse:focus,
.xc .btn-inverse:active,
.xc .btn-inverse.active,
.xc .btn-inverse.disabled,
.xc .btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515}
.xc .btn-inverse:active,
.xc .btn-inverse.active{background-color:#080808 \9}
.xc button.btn,
.xc input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}
.xc button.btn::-moz-focus-inner,
.xc input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}
.xc .btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}
.xc .btn-group:first-child{*margin-left:0}
.xc .btn-group+.btn-group{margin-left:5px}
.xc .btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.xc .btn-group>.btn+.btn{margin-left:-1px}
.xc .btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}
.xc .btn-group>.btn:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}
.xc .btn-group>.btn:hover,
.xc .btn-group>.btn:focus,
.xc .btn-group>.btn:active,
.xc .btn-group>.btn.active{z-index:2}
/* Communication Module Customize */
.xc,
.xc input,
@ -285,7 +242,7 @@
.xc table{font-size:13px}
.xc h1{font-size:22px}
.xc .nav a,
.xc .btn{text-decoration:none}
.xc .rhymix_button{text-decoration:none}
.xc .table{border-top:1px solid #ddd;border-bottom:1px solid #ddd}
.xc .table>caption{text-align:left;font-weight:bold}
.xc .table>caption>.pull-right{position:relative;top:-8px}

24
modules/communication/skins/default/friends.html
View file

@ -2,7 +2,7 @@
<load target="filter/delete_friend_group.xml" />
<load target="filter/move_friend.xml" />
<h1>{$member_title = $lang->cmd_view_friend }</h1>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/frineds/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/frineds/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="deleteCheckedFriend" id="fo_friend_list" action="./" method="post">
@ -10,7 +10,7 @@
<input type="hidden" name="act" value="procCommunicationDeleteFriend" />
<input type="hidden" name="xe_validator_id" value="modules/communication/skins/default/frineds/1" />
<div class="btnArea">
<div class="rhymix_button_wrapper">
<span class="etc">
<select name="jumpMenu" id="jumpMenu" style="margin:0">
<option value="">{$lang->default_friend_group}</option>
@ -18,15 +18,15 @@
<option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
<!--@end-->
</select>
<button type="button" class="btn" onclick="doJumpFriendGroup()">{$lang->cmd_move}</button>
<button type="button" class="rhymix_button" onclick="doJumpFriendGroup()">{$lang->cmd_move}</button>
</span>
<select name="friend_group_list" id="friend_group_list" cond="count($friend_group_list)" style="margin:0">
<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}" selected="selected"|cond="$val->friend_group_srl == $friend_group_srl">{$val->title}</option>
</select>
<span class="btn-group">
<button type="button" class="btn" cond="count($friend_group_list)" onclick="doRenameFriendGroup();return false;">{$lang->cmd_rename_friend_group}</button>
<button type="button" class="btn" cond="count($friend_group_list)" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete_friend_group}</button>
<a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" class="btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
<span class="rhymix_button_group">
<button type="button" class="rhymix_button" cond="count($friend_group_list)" onclick="doRenameFriendGroup();return false;">{$lang->cmd_rename_friend_group}</button>
<button type="button" class="rhymix_button" cond="count($friend_group_list)" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete_friend_group}</button>
<a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" class="rhymix_button" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
</span>
</div>
@ -43,19 +43,19 @@
<tbody>
<tr loop="$friend_list => $no,$val">
<td>{$val->group_title?$val->group_title:$lang->default_friend_group}</td>
<td><a href="#popup_menu_area" class="member_{$val->target_srl}">{$val->nick_name}</a></td>
<td><a href="#rhymix_popup_menu" class="member_{$val->target_srl}">{$val->nick_name}</a></td>
<td>{zdate($val->regdate,"Y-m-d")}</td>
<td><input type="checkbox" name="friend_srl_list[]" value="{$val->friend_srl}" /></td>
</tr>
</tbody>
</table>
<div class="btnArea">
<div class="rhymix_button_wrapper">
<select name="target_friend_group_srl" cond="count($friend_group_list)" style="margin:0">
<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}">{$val->title}</option>
</select>
<span class="btn-group __submit_group">
<button type="submit" name="act" class="btn" cond="count($friend_group_list)" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
<button type="submit" name="act" class="btn" value="procCommunicationDeleteFriend">{$lang->cmd_delete}</button>
<span class="rhymix_button_group __submit_group">
<button type="submit" name="act" class="rhymix_button" cond="count($friend_group_list)" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
<button type="submit" name="act" class="rhymix_button" value="procCommunicationDeleteFriend">{$lang->cmd_delete}</button>
</span>
</div>
<div class="pagination pagination-centered">

24
modules/communication/skins/default/messages.html
View file

@ -2,9 +2,9 @@
<load target="filter/delete_checked_message.xml" />
<load target="filter/update_allow_message.xml" />
<div class="btnArea">
<div style="margin:0;display:block;float:left" class="btn-group">
<button loop="$lang->message_box => $key,$val" class="btn" onclick="location.href=current_url.setQuery('act', 'dispCommunicationMessages').setQuery('message_srl', '').setQuery('message_type', '{$key}'); return false;" style="font-weight:bold"|cond="$message_type == $key">{$val}</button>
<div class="rhymix_button_wrapper">
<div style="margin:0;display:block;float:left" class="rhymix_button_group">
<button loop="$lang->message_box => $key,$val" class="rhymix_button" onclick="location.href=current_url.setQuery('act', 'dispCommunicationMessages').setQuery('message_srl', '').setQuery('message_type', '{$key}'); return false;" style="font-weight:bold"|cond="$message_type == $key">{$val}</button>
</div>
<form action="./" method="POST" style="margin:0;display:block;float:right">
<input type="hidden" name="module" value="communication" />
@ -13,7 +13,7 @@
<select name="allow_message" style="margin:0">
<option loop="$lang->allow_message_type => $key,$val" value="{$key}" selected="selected"|cond="$logged_info->allow_message==$key">{$val}</option>
</select>
<input type="submit" value="{$lang->cmd_save}" class="btn">
<input type="submit" value="{$lang->cmd_save}" class="rhymix_button">
</form>
<div style="clear:both"></div>
</div>
@ -23,7 +23,7 @@
</tr>
<tr>
<td>
<a href="popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a>
<a href="rhymix_popup_menu" class="member_{$message->member_srl}">{$message->nick_name}</a>
{zdate($message->regdate, "Y.m.d H:i")}
</td>
</tr>
@ -33,10 +33,10 @@
</td>
</tr>
</table>
<div class="btnArea btn-group" cond="$message" style="margin-bottom:20px">
<button class="btn" cond="$message->message_type != 'S' && $message->member_srl != $logged_info->member_srl" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');">{$lang->cmd_reply_message}</button>
<button class="btn" cond="$message->message_type == 'R'" type="button" onclick="doStoreMessage('{$message->message_srl}');">{$lang->cmd_store}</button>
<button class="btn" type="button" onclick="doDeleteMessage('{$message->message_srl}');">{$lang->cmd_delete}</button>
<div class="rhymix_button_wrapper rhymix_button_group" cond="$message" style="margin-bottom:20px">
<button class="rhymix_button" cond="$message->message_type != 'S' && $message->member_srl != $logged_info->member_srl" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');">{$lang->cmd_reply_message}</button>
<button class="rhymix_button" cond="$message->message_type == 'R'" type="button" onclick="doStoreMessage('{$message->message_srl}');">{$lang->cmd_store}</button>
<button class="rhymix_button" type="button" onclick="doDeleteMessage('{$message->message_srl}');">{$lang->cmd_delete}</button>
</div>
<form action="./" method="post" id="fo_message_list">
@ -66,7 +66,7 @@
<a cond="$val->readed!='Y'" href="{getUrl('message_srl',$val->message_srl)}"><strong>{$val->title}</strong></a>
</td>
<td>
<a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a>
<a href="#rhymix_popup_menu" class="member_{$val->member_srl}">{$val->nick_name}</a>
</td>
<td>
{zdate($val->regdate,"Y-m-d")}
@ -76,8 +76,8 @@
</tr>
</tbody>
</table>
<div class="btnArea">
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
<div class="rhymix_button_wrapper">
<input type="submit" class="rhymix_button" value="{$lang->cmd_delete}" />
</div>
</form>
<div class="pagination pagination-centered">

12
modules/communication/skins/default/new_message.html
View file

@ -6,7 +6,7 @@
<!--@if($message->member_srl != $logged_info->member_srl)-->
<tr>
<th scope="row">{$lang->sender}</th>
<td><a href="#popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a></td>
<td><a href="#rhymix_popup_menu" class="member_{$message->member_srl}">{$message->nick_name}</a></td>
</tr>
<!--@end-->
<tr>
@ -17,11 +17,11 @@
<td colspan="2" class="xe_content">{$message->content}</td>
</tr>
</table>
<div class="btnArea">
<span class="btn-group">
<button cond="$message->member_srl != $logged_info->member_srl" class="btn" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;">{$lang->cmd_reply_message}</button>
<button type="button" class="btn" onclick="doStoreMessage('{$message->message_srl}');return false;">{$lang->cmd_store}</button>
<button type="button" class="btn" onclick="doDeleteMessage('{$message->message_srl}');return false;">{$lang->cmd_delete}</button>
<div class="rhymix_button_wrapper">
<span class="rhymix_button_group">
<button cond="$message->member_srl != $logged_info->member_srl" class="rhymix_button" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;">{$lang->cmd_reply_message}</button>
<button type="button" class="rhymix_button" onclick="doStoreMessage('{$message->message_srl}');return false;">{$lang->cmd_store}</button>
<button type="button" class="rhymix_button" onclick="doDeleteMessage('{$message->message_srl}');return false;">{$lang->cmd_delete}</button>
</span>
</div>
</div>

8
modules/communication/skins/default/send_message.html
View file

@ -2,7 +2,7 @@
<load target="js/communication.js" />
<div class="xc">
<h1>{$lang->cmd_send_message}</h1>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/send_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/send_message/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="x_label x_label-important" cond="$logged_info->allow_message !== 'Y'">
@ -24,7 +24,7 @@
<table class="table table-striped table-hover">
<tr>
<th scope="row"><label for="textfield1">{$lang->receiver}</label></th>
<td><a href="#popup_menu_area" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a></td>
<td><a href="#rhymix_popup_menu" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a></td>
</tr>
<tr>
<th scope="row">{$lang->title}</th>
@ -36,8 +36,8 @@
</tr>
</table>
{$editor}
<div class="btnArea">
<input type="submit" value="{$lang->cmd_send_message}" class="btn btn-inverse" />
<div class="rhymix_button_wrapper">
<input type="submit" value="{$lang->cmd_send_message}" class="rhymix_button inverse" />
</div>
</form>
</div>

4
modules/communication/skins/simple_world/css/css.less
View file

@ -221,7 +221,7 @@ section.rx_simple_communication {
white-space: normal;
box-sizing: border-box;
div.control-group, .sw-footer, .sw-anchor-buttons {
&>input[type="submit"], &>input.btn.dateRemover, &>a, &>button, &>select {
&>input[type="submit"], &>input.rhymix_button.dateRemover, &>a, &>button, &>select {
display: inline-block;
padding: 8px;
vertical-align: bottom;
@ -233,7 +233,7 @@ section.rx_simple_communication {
margin-top: 1px;
margin-bottom: 2px;
}
&>input[type="submit"], &>input.btn.dateRemover {
&>input[type="submit"], &>input.rhymix_button.dateRemover {
.bg-contrast(#000; lighten(@color,5%); darken(@color,5%); 3.0);
}
}

2
modules/communication/skins/simple_world/friends.html
View file

@ -28,7 +28,7 @@
<input type="hidden" name="xe_validator_id" value="modules/communication/skins/simple_world/frineds/1" />
<ul class="rx_sw_list">
<li loop="$friend_list => $no,$val">
<a href="#popup_menu_area" class="cont_a member_{$val->target_srl}">
<a href="#rhymix_popup_menu" class="cont_a member_{$val->target_srl}">
<span class="content_basic member_{$val->target_srl}">
<span class="content_title member_{$val->target_srl}">
{escape($val->nick_name)}

2
modules/communication/skins/simple_world/messages.html
View file

@ -4,7 +4,7 @@
<section class="sw-body" cond="$message">
<h1>{escape($message->title)}</h1>
<div>
<a href="popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
<a href="rhymix_popup_menu" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
</div>
<div class="xe_content">
{$message->content}

2
modules/communication/skins/simple_world/new_message.html
View file

@ -3,7 +3,7 @@
<section class="sw-body" cond="$message">
<h1>{escape($message->title)}</h1>
<div>
<a href="popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
<a href="rhymix_popup_menu" class="member_{$message->member_srl}">{$message->nick_name}</a> / {zdate($message->regdate, "Y-m-d H:i")}
</div>
<div class="xe_content">
{$message->content}

2
modules/communication/skins/simple_world/send_message.html
View file

@ -13,7 +13,7 @@
<input type="hidden" name="xe_validator_id" value="modules/communication/skins/simple_world/send_message/1" />
<div class="control-group">
<label for="message_receiver">{$lang->receiver}</label>
<a id="message_receiver" href="#popup_menu_area" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a>
<a id="message_receiver" href="#rhymix_popup_menu" class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</a>
<label for="message_title">{$lang->title}</label>
<input type="text" name="title" id="message_title" value="{$source_message->title}" />
<label for="message_send_mail"><input type="checkbox" value="Y" name="send_mail" id="message_send_mail" /> {$lang->cmd_send_mail}</label>

4
modules/communication/tpl/index.html
View file

@ -11,7 +11,7 @@
<p class="x_alert x_alert-info" id="aboutCommunication" hidden>{nl2br($lang->about_communication)}</p>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/tpl/index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/tpl/index/1'" class="rhymix_message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -126,7 +126,7 @@
</div>
</div>
</div>
<div class="btnArea">
<div class="rhymix_button_wrapper">
<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
</div>
</form>

2
modules/communication/tpl/js/member_communication.js
View file

@ -3,7 +3,7 @@
window.xeNotifyMessage = function(text, count){
$bar = $('div.message.info');
if(!$bar.length) {
$bar = jQuery('<div class="message info"></div>').hide().css({
$bar = jQuery('<div class="rhymix_message info"></div>').hide().css({
'position' : 'absolute',
'opacity' : 0.7,
'z-index' : 10000,

2
modules/document/document.item.php
View file

@ -651,7 +651,7 @@ class documentItem extends BaseObject
if($add_popup_menu)
{
$content = sprintf(
'%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
'%s<div class="document_popup_menu"><a href="#rhymix_popup_menu" class="document_%d" onclick="return false">%s</a></div>',
$content,
$this->document_srl, lang('cmd_document_do')
);

Some files were not shown because too many files have changed in this diff Show more