From b9359b1ceee43943c4a6cd4110bde22991b77bac Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 15 Jan 2016 13:15:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAurl=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/setting.html.erb | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 1c7f0d280..962a7a497 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -54,13 +54,13 @@
           <div class="cl"></div>
         </div>
             <div style="margin-left: 80px " id="check_desc_hint"></div>
-        <!--<div class="orgRow mb10"><span class="ml10">组织URL：</span>-->
-          <!--<div class="w607 fr">http：//-->
-            <!--<input type="text" name="organization[domain]" id="domain" value="<%#= @organization.domain%>" class="orgUrlInput" />-->
-            <!--.trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%#= @organization.id %>,$('#domain').val());">申请</a>-->
-            <!--<p class="c_green f12" id="apply_hint" ></p></div>-->
-          <!--&lt;!&ndash;class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 &ndash;&gt;-->
-        <!--</div>-->
+        <div class="orgRow mb10"><span class="ml10">组织URL：</span>
+          <div class="w607 fr">http：//
+            <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" class="orgUrlInput" />
+            .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
+            <p class="c_green f12" id="apply_hint" ></p></div>
+          <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
+        </div>
         <div class="cl"></div>
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
           <input type="checkbox" name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
@@ -115,15 +115,15 @@
             <p class="fontBlue fb mb5">新增栏目</p>
             <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
                 <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-                <!--<div class="mb5">-->
-                  <!--<p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>-->
-                  <!--<%# if @organization.domain %>-->
-                    <!--<span class="fl"><%#= @organization.domain %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">-->
-                  <!--<%# else %>-->
-                      <!--<span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>-->
-                  <!--<%# end %>-->
-                  <!--<div class="cl"></div>-->
-                <!--</div>-->
+                <div class="mb5">
+                  <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
+                  <% if @organization.domain %>
+                    <span class="fl"><%= @organization.domain %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
+                  <% else %>
+                      <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                  <% end %>
+                  <div class="cl"></div>
+                </div>
                 <ul class="orgAddRole">
                   <li class="fontGrey3 fb mb10">栏目类型</li>
                   <li class="fl mr15">