Skip to content

Commit

Permalink
merged
Browse files Browse the repository at this point in the history
  • Loading branch information
@metacortex
metacortex committed Feb 22, 2011
2 parents cb2d467 + 375e976 commit 0c8f506
Show file tree
Hide file tree
Showing 9 changed files with 112 additions and 129 deletions.
2 changes: 0 additions & 2 deletions app/controllers/main_controller.rb
View file
@@ -1,8 +1,6 @@
# encoding: UTF-8
class MainController < ApplicationController

layout 'main'

def question
Thread.new do
UserMailer.question(params).deliver
Expand Down
9 changes: 7 additions & 2 deletions app/views/layouts/application.html.erb
View file
Expand Up @@ -20,8 +20,13 @@
</div>

<div id="footer">
<%= link_to_function image_tag('Index/Bottom/index_bottom_menu_01.png'), "zLayer.open('/privacy.html?s=auto')" %>
<%= link_to_function image_tag('Index/Bottom/index_bottom_menu_02.png'), "zLayer.open('/agreement.html?s=auto')" %>
<ul id="family_sites" style="display:none" class="fragile do_hide">
<li><%= link_to "하비스트 US", "http://www.harvesttech.com", :class => "link" %></li>
<li><%= link_to "(주)미라", "http://mirarush.com", :class => "link" %></li>
</ul>
<%= link_to_function "", "$('family_sites').show()", :class => "family_site" %>
<%= link_to_function image_tag('Index/Bottom/index_bottom_menu_01.png'), "zLayer.open('/privacy.html?s=auto')", :class => "overlay" %>
<%= link_to_function image_tag('Index/Bottom/index_bottom_menu_02.png'), "zLayer.open('/agreement.html?s=auto')", :class => "overlay" %>
</div>
</div>

Expand Down
52 changes: 0 additions & 52 deletions app/views/layouts/main.html.erb
View file

This file was deleted.

2 changes: 1 addition & 1 deletion public/agreement.html
View file
@@ -1,4 +1,4 @@
<div style="width:640px;word-break:all;font-size:13px;line-height:1.4;"><br/><br/>
<div style="width:600px;word-break:all;font-size:12px;line-height:1.4;padding:20px"><br/>
<h4>제 1 장 총칙</h4><br/>
<h5>제 1 조 (목적)</h5><br/>
본 약관은 주식회사 미라(이하 "회사"라 함)에서 수입 및 제공하는 하비스트 사이트(이하"서비스”라 함)의 이용에 관련하여 "회사"와 "회원"간의 권리와 의무, 책임사항 및 기타 필요한 사항을 규정함을 목적으로 합니다.<br/>
Expand Down
2 changes: 1 addition & 1 deletion public/javascripts/zlayer.js
View file
Expand Up @@ -59,7 +59,7 @@ zlayer.prototype.render = function(content) {
};

zlayer.prototype.positioning = function() {
var pt_dm = this.plate.getDimensions();
var pt_dm = $(this.plate).getDimensions();
var vp_dm = document.viewport.getDimensions();
var vp_sc = document.viewport.getScrollOffsets();

Expand Down
2 changes: 1 addition & 1 deletion public/privacy.html
View file
@@ -1,4 +1,4 @@
<div style="width:640px;word-break:all;font-size:13px;line-height:1.4;"><br/>
<div style="width:600px;word-break:all;font-size:12px;line-height:1.4;padding:20px"><br/>
<h2>개인정보보호정책</h2>
<br/>
주식회사 미라(이하 “회사”라 함)은 이용자들의 개인정보보호를 매우 중요시하며, 이용자가 회사의 서비스를 이용함과 동시에 온라인상에서 회사에게 제공한 개인 정보 보호를 위해 최선을 다합니다. 이를 위해 회사는 통신비밀보호법, 전기통신사업법, 정보통신망 이용촉진 및 정보보호 등에 관한 법률 등 정보통신제공서비스제공자가 준수하여야 할 관련 법규상의 개인정보보호 규정 및 정보통신부가 제정한 개인정보보호지침을 준수하고 있습니다. 회사는 개인정보 보호정책을 통하여 이용자들이 제공하는 개인 정보가 어떠한 용도와 방식으로 이용되고 있으며 개인정보보호를 위해 취해지는 조치에 대해 알려드립니다.<br/>
Expand Down
104 changes: 60 additions & 44 deletions public/stylesheets/application.css
View file
Expand Up @@ -164,84 +164,78 @@
display: block;
width: 192px;
text-indent: -9999px;
margin-bottom: 1px;
height: 22px;
background: url(/images/blank.gif) no-repeat 50% 50%; }
height: 23px;
background: url(/images/Index/Sub_menu/index_sub_set.png) no-repeat 0 0; }
#header div.sections div.section .folder_container a:focus {
outline: none; }
#header div.sections div.section .section_1 a.folder_1 {
height: 23px;
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -2px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px 0px; }
#header div.sections div.section .section_1 a.folder_1.showing, #header div.sections div.section .section_1 a.folder_1:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -122px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -120px; }
#header div.sections div.section .section_1 a.folder_2 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -26px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -23px; }
#header div.sections div.section .section_1 a.folder_2.showing, #header div.sections div.section .section_1 a.folder_2:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -146px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -143px; }
#header div.sections div.section .section_1 a.folder_3 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -50px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -46px; }
#header div.sections div.section .section_1 a.folder_3.showing, #header div.sections div.section .section_1 a.folder_3:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -170px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat 0px -166px; }
#header div.sections div.section .section_2 a.folder_1 {
height: 23px;
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -2px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px 0px; }
#header div.sections div.section .section_2 a.folder_1.showing, #header div.sections div.section .section_2 a.folder_1:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -122px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -120px; }
#header div.sections div.section .section_2 a.folder_2 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -26px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -23px; }
#header div.sections div.section .section_2 a.folder_2.showing, #header div.sections div.section .section_2 a.folder_2:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -146px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -143px; }
#header div.sections div.section .section_2 a.folder_3 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -50px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -46px; }
#header div.sections div.section .section_2 a.folder_3.showing, #header div.sections div.section .section_2 a.folder_3:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -170px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -166px; }
#header div.sections div.section .section_2 a.folder_4 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -74px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -69px; }
#header div.sections div.section .section_2 a.folder_4.showing, #header div.sections div.section .section_2 a.folder_4:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -194px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -192px -189px; }
#header div.sections div.section .section_3 a.folder_1 {
height: 23px;
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -2px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px 0px; }
#header div.sections div.section .section_3 a.folder_1.showing, #header div.sections div.section .section_3 a.folder_1:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -122px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -120px; }
#header div.sections div.section .section_3 a.folder_2 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -26px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -23px; }
#header div.sections div.section .section_3 a.folder_2.showing, #header div.sections div.section .section_3 a.folder_2:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -146px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -143px; }
#header div.sections div.section .section_3 a.folder_3 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -50px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -46px; }
#header div.sections div.section .section_3 a.folder_3.showing, #header div.sections div.section .section_3 a.folder_3:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -170px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -166px; }
#header div.sections div.section .section_3 a.folder_4 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -74px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -69px; }
#header div.sections div.section .section_3 a.folder_4.showing, #header div.sections div.section .section_3 a.folder_4:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -194px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -384px -189px; }
#header div.sections div.section .section_4 a.folder_1 {
height: 23px;
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -2px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px 0px; }
#header div.sections div.section .section_4 a.folder_1.showing, #header div.sections div.section .section_4 a.folder_1:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -122px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -120px; }
#header div.sections div.section .section_4 a.folder_2 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -26px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -23px; }
#header div.sections div.section .section_4 a.folder_2.showing, #header div.sections div.section .section_4 a.folder_2:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -146px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -576px -143px; }
#header div.sections div.section .section_5 a.folder_1 {
height: 23px;
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -2px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px 0px; }
#header div.sections div.section .section_5 a.folder_1.showing, #header div.sections div.section .section_5 a.folder_1:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -122px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -120px; }
#header div.sections div.section .section_5 a.folder_2 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -26px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -23px; }
#header div.sections div.section .section_5 a.folder_2.showing, #header div.sections div.section .section_5 a.folder_2:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -146px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -143px; }
#header div.sections div.section .section_5 a.folder_3 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -50px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -46px; }
#header div.sections div.section .section_5 a.folder_3.showing, #header div.sections div.section .section_5 a.folder_3:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -170px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -166px; }
#header div.sections div.section .section_5 a.folder_4 {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -74px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -69px; }
#header div.sections div.section .section_5 a.folder_4.showing, #header div.sections div.section .section_5 a.folder_4:hover {
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -194px; }
background: url("/images/Index/Sub_menu/index_sub_set.png") no-repeat -768px -189px; }

#section #rail {
width: 960px; }
Expand Down Expand Up @@ -555,8 +549,30 @@
#footer {
width: 960px;
height: 212px;
background: url(/images/Index/Bottom/index_bottom_background.png) no-repeat 0 0; }
#footer a {
background: url(/images/Index/Bottom/index_bottom_background.png) no-repeat 0 0;
position: relative; }
#footer ul#family_sites {
position: absolute;
width: 176px;
left: 502px;
top: 90px;
border: 1px solid #dbdbd9;
height: 50px;
background: #f0f1ec; }
#footer ul#family_sites li {
height: 25px;
line-height: 25px;
padding: 0 5px; }
#footer ul#family_sites li a {
color: #545550; }
#footer a.family_site {
display: block;
width: 178px;
height: 18px;
position: absolute;
left: 502px;
top: 142px; }
#footer a.overlay {
position: relative;
top: 185px; }

Expand Down
Binary file removed public/stylesheets/sass/.mixin.sass.swp
View file
Binary file not shown.

0 comments on commit 0c8f506

Please sign in to comment.