Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
    * UI 정리
	     * 위젯 하위로 표지/사이드바 통합
		 * about 란에 needlworks 추가
  • Loading branch information
inureyes committed May 9, 2008
1 parent 15b918e commit 00136e2
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 8 deletions.
Binary file added image/needlworks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions interface/owner/center/about/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<div id="XHTML-ValidIcon">
<img src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1!" />
</div>
<div id="Needlworks-Icon">
<img src="<?php echo $serviceURL;?>/image/needlworks.png" alt="Made by Needlworks / TNF" />
</div>
<div class="clear"></div>
</div>

<div id="developer-description" class="section">
Expand Down
2 changes: 2 additions & 0 deletions interface/owner/control/server/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function getEncodedValueById(id) {
return encodeURIComponent(val);
}
function setConfigFile() {
if(!confirm('<?php echo _f('적용하시면 기존의 %1 파일이 변경됩니다. 이 변경사항은 되돌릴 수 없습니다. 그래도 적용하시겠습니까?','config.php');?>')) return;
if(document.getElementById('usePageCache').checked) usePageCache = 1;
else usePageCache = 0;
if(document.getElementById('useSkinCache').checked) useSkinCache = 1;
Expand Down Expand Up @@ -96,6 +97,7 @@ function setSmtp() {
if(!defined('__TEXTCUBE_NO_FANCY_URL__')) {
?>
function setRewrite() {
if(!confirm('<?php echo _f('적용하시면 기존의 %1 파일이 변경됩니다. 이 변경사항은 되돌릴 수 없습니다. 그래도 적용하시겠습니까?','.htaccess');?>')) return;
var htaccess = document.getElementById('rewrite');

var request = new HTTPRequest("POST", "<?php echo $blogURL;?>/owner/control/server/rewrite/");
Expand Down
9 changes: 7 additions & 2 deletions interface/owner/skin/coverpage/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/// All rights reserved. Licensed under the GPL.
/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
require ROOT . '/lib/includeForBlogOwner.php';
$tabsClass['cover'] = true;
requireLibrary('blog.skin');
requireModel("blog.sidebar");
requireModel("blog.coverpage");
Expand Down Expand Up @@ -233,6 +234,10 @@ function pretty_dress($view)
?>
<form id="part-coverpage-order" class="part" method="post" action="<?php echo parseURL($blogURL.'/owner/skin/coverpage');?>">
<h2 class="caption"><span class="main-text"><?php echo _t('표지를 관리합니다');?></span></h2>
<?php
require ROOT . '/lib/piece/owner/skinTab.php';
?>

<?php
if(isset($skin->cover)) {
?>
Expand Down Expand Up @@ -262,7 +267,7 @@ function pretty_dress($view)
else
$errmsg = '사용중인 표지 플러그인이 없습니다.';
?>
<ul id="coverpage-tabs-box" class="tabs-box">
<ul id="coverpage-tabs-box" class="tabs-box right">
<li class="selected"><a id="default-mode-button" class="button" href="<?php echo $blogURL;?>/owner/skin/coverpage" title="<?php echo _t('실제 출력되는 내용을 직접 볼 수 있는 기본 모드입니다.');?>"><?php echo _t('기본모드');?></a></li>
</ul>

Expand All @@ -284,7 +289,7 @@ function pretty_dress($view)
}
}
?>
<ul id="coverpage-tabs-box" class="tabs-box">
<ul id="coverpage-tabs-box" class="tabs-box right">
<li<?php echo $defaultModeSelected ? ' class="selected"' : NULL;?>><a id="default-mode-button" class="button" href="<?php echo $blogURL;?>/owner/skin/coverpage" title="<?php echo _t('실제 출력되는 내용을 직접 볼 수 있는 기본 모드입니다.');?>"><?php echo _t('기본모드');?></a></li>
<li<?php echo $safeModeSelected ? ' class="selected"' : NULL;?>><a id="safe-mode-button" class="button" href="<?php echo $blogURL;?>/owner/skin/coverpage?safe" title="<?php echo _t('태그를 사용하지 않아 레이아웃이 깨질 위험이 없는 모드입니다.');?>"><?php echo _t('안전모드');?></a></li>
<li<?php echo $tagModeSelected ? ' class="selected"' : NULL;?>><a id="tag-mode-button" class="button" href="<?php echo $blogURL;?>/owner/skin/coverpage?tag" title="<?php echo _t('실제 블로그 표지에 사용되는 태그를 직접사용하는 모드입니다.');?>"><?php echo _t('태그모드');?></a></li>
Expand Down
9 changes: 6 additions & 3 deletions interface/owner/skin/sidebar/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/// All rights reserved. Licensed under the GPL.
/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
require ROOT . '/lib/includeForBlogOwner.php';
$tabsClass['sidebar'] = true;
requireLibrary('blog.skin');
requireModel("blog.sidebar");
requireModel("blog.entry");
Expand Down Expand Up @@ -216,7 +217,9 @@ function pretty_dress($view)
?>
<form id="part-sidebar-order" class="part" method="post" action="<?php echo parseURL($blogURL.'/owner/skin/sidebar/register'.$viewMode2);?>">
<h2 class="caption"><span class="main-text"><?php echo _t('사이드바 기능을 관리합니다');?></span></h2>

<?php
require ROOT . '/lib/piece/owner/skinTab.php';
?>
<div class="main-explain-box">
<p class="explain"><?php echo _t('블로그의 사이드바 구성을 변경할 수 있습니다. 사이드바는 블로그 화면에서 양 옆이나 위아래에 표시되는 메뉴가 있는 부분을 말합니다. 사이드바에 새로운 요소를 추가/삭제할 수 있으며 자유로운 위치 이동을 할 수 있습니다.');?></p>
</div>
Expand All @@ -229,7 +232,7 @@ function pretty_dress($view)
<?php
if ($sidebarCount == 0) {
?>
<ul id="sidebar-tabs-box" class="tabs-box">
<ul id="sidebar-tabs-box" class="tabs-box right">
<li class="selected"><a id="default-mode-button" class="button" href="<?php echo parseURL($blogURL.'/owner/skin/sidebar');?>" title="<?php echo _t('실제 출력되는 내용을 직접 볼 수 있는 기본 모드입니다.');?>"><?php echo _t('기본모드');?></a></li>
</ul>

Expand All @@ -252,7 +255,7 @@ function pretty_dress($view)
}
}
?>
<ul id="sidebar-tabs-box" class="tabs-box">
<ul id="sidebar-tabs-box" class="tabs-box right">
<li<?php echo $defaultModeSelected ? ' class="selected"' : NULL;?>><a id="default-mode-button" class="button" href="<?php echo parseURL($blogURL.'/owner/skin/sidebar');?>" title="<?php echo _t('실제 출력되는 내용을 직접 볼 수 있는 기본 모드입니다.');?>"><?php echo _t('기본모드');?></a></li>
<li<?php echo $safeModeSelected ? ' class="selected"' : NULL;?>><a id="safe-mode-button" class="button" href="<?php echo parseURL($blogURL.'/owner/skin/sidebar?safe');?>" title="<?php echo _t('태그를 사용하지 않아 레이아웃이 깨질 위험이 없는 모드입니다.');?>"><?php echo _t('안전모드');?></a></li>
<li<?php echo $tagModeSelected ? ' class="selected"' : NULL;?>><a id="tag-mode-button" class="button" href="<?php echo parseURL($blogURL.'/owner/skin/sidebar?tag');?>" title="<?php echo _t('실제 블로그 사이드바에 사용되는 태그를 직접사용하는 모드입니다.');?>"><?php echo _t('태그모드');?></a></li>
Expand Down
7 changes: 4 additions & 3 deletions lib/piece/owner/contentMenu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
array('menu'=>'skin','title'=>_t('스킨 선택'),'link'=>'/owner/skin'),
array('menu'=>'edit','title'=>_t('스킨 편집'),'link'=>'/owner/skin/edit'),
array('menu'=>'setting','title'=>_t('상세 설정'),'link'=>'/owner/skin/setting'),
array('menu'=>'coverpage','title'=>_t('색동'),'link'=>'/owner/skin/coverpage'),
array('menu'=>'sidebar','title'=>_t('사이드바'),'link'=>'/owner/skin/sidebar'),
array('menu'=>'widget','title'=>_t('위젯'),'link'=>'/owner/skin/sidebar'),
array('menu'=>'adminSkin','title'=>_t('관리자 패널 스킨 선택'),'link'=>'/owner/skin/adminSkin')
);
}
Expand Down Expand Up @@ -146,7 +145,9 @@
$blogMenu['contentMenu'] = 'comment';
else if(in_array($blogMenu['contentMenu'],array('linkadd','linkedit','linkcategoryEdit','xfn')))
$blogMenu['contentMenu'] = 'link';

else if(in_array($blogMenu['contentMenu'],array('coverpage','sidebar')))
$blogMenu['contentMenu'] = 'widget';

foreach($blogContentMenuItem as $contentMenuItem) {
$PostIdStr = null;
if(strstr($contentMenuItem['menu'], 'adminMenu?name=') !== false) {
Expand Down
4 changes: 4 additions & 0 deletions lib/piece/owner/skinTab.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<ul id="link-tabs-box" class="tabs-box">
<li<?php echo isset($tabsClass['cover']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/skin/coverpage"><?php echo _t('표지 위젯');?></a></li>
<li<?php echo isset($tabsClass['sidebar']) ? ' class="selected"' : NULL;?>><a href="<?php echo $blogURL;?>/owner/skin/sidebar"><?php echo _t('사이드바 위젯');?></a></li>
</ul>
5 changes: 5 additions & 0 deletions style/admin/whitedream/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,11 @@ h2.caption span
margin: 0 1px;
}

.right li
{
float: right !important;
}

.tabs-box li a
{
padding: 0 1em;
Expand Down
6 changes: 6 additions & 0 deletions style/admin/whitedream/center.css
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,12 @@
#XHTML-ValidIcon
{
padding-left: 20px;
float:left;
}

#Needlworks-Icon
{
float:left;
}

#developer-description
Expand Down

0 comments on commit 00136e2

Please sign in to comment.