diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb
index 26da7e081..023069dd0 100644
--- a/app/views/school/upload_logo.html.erb
+++ b/app/views/school/upload_logo.html.erb
@@ -13,15 +13,21 @@ function showPreview(source) {
 
 <%= form_tag(upload_school_path(@school.id),method: "post",  multipart: true) do %>
 	<%#= text_field_tag 'school'%>
-    <div style="margin: 20px;">
+    <div style="padding:15px; border: 1px solid #dddddd;">
       <input type="hidden" value="<%= @school_name%>" name="school_name">
       <%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar")%>
-      <a type="button" onclick="$('#file').click();" style="margin: 90px 0 0 10px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 55px;">上传图片</a>
+      <a type="button" onclick="$('#file').click();" style="margin: 86px 0 0 15px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 55px;">上传图片</a>
       <%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%>
       <div style="clear: both;"></div>
+      <div class="mt15">学校名称：<input type="text" placeholder="现在对应的学校名称" class="schoolName ml4"/></div>
+      <div class="mt10">学校省份：
+        <select class="provinceSelect"><option value="0" selected="true" style="display: none;"></option><option value="湖南省">湖南省</option><option value="北京市">北京市</option><option value="天津市">天津市</option><option value="河北省">河北省</option><option value="山西省">山西省</option><option value="内蒙古自治区">内蒙古自治区</option><option value="辽宁省">辽宁省</option><option value="吉林省">吉林省</option><option value="黑龙江省">黑龙江省</option><option value="上海市">上海市</option><option value="江苏省">江苏省</option><option value="浙江省">浙江省</option><option value="安徽省">安徽省</option><option value="福建省">福建省</option><option value="江西省">江西省</option><option value="山东省">山东省</option><option value="河南省">河南省</option><option value="湖北省">湖北省</option><option value="广东省">广东省</option><option value="广西壮族自治区">广西壮族自治区</option><option value="海南省">海南省</option><option value="重庆市">重庆市</option><option value="四川省">四川省</option><option value="贵州省">贵州省</option><option value="云南省">云南省</option><option value="西藏自治区">西藏自治区</option><option value="陕西省">陕西省</option><option value="甘肃省">甘肃省</option><option value="青海省">青海省</option><option value="宁夏回族自治区">宁夏回族自治区</option><option value="新疆维吾尔自治区">新疆维吾尔自治区</option><option value="香港">香港</option><option value="澳门">澳门</option><option value="台湾">台湾</option></select>
+      </div>
       <div style="margin-top: 10px;">
-        <%= submit_tag('上传') %>
-        <%= submit_tag('取消') %>
+        <input type="button" value="提交" class="mr5 submit_btn" />
+        <input type="button" value="取消" class="cancel_btn" />
+        <%#= submit_tag('提交',:class=>'mr5') %>
+        <%#= submit_tag('取消') %>
       </div>
     </div>
 <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a08c7760b..6c6227ed4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -8,6 +8,14 @@ h3, .wiki h2 {font-size: 15px; padding-left: 5px}
 h4, .wiki h3 {font-size: 13px;}
 h4 {border-bottom: 1px dotted #bbb;}
 li{list-style-type:none;}
+
+/*Tim 151019*/
+.schoolName {border:1px solid #dddddd; outline: none; width: 180px; height: 22px;}
+.provinceSelect {border: 1px solid #dddddd; outline: none; color: #888888;}
+.submit_btn {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
+.submit_btn:hover {background-color:#297fb8;}
+.cancel_btn {background-color: #c1c1c1; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
+.cancel_btn:hover {background-color:#656565; }
 /*huang*/
 
 .hwork_input_news{ border:1px solid #64bdd9; height:22px; width:594px; background:#fff; margin-bottom:10px; padding:5px;}
@@ -2805,7 +2813,7 @@ img,embed{max-width: 100%;}
 img.school_avatar {
     background: rgb(245, 245, 245);
     padding: 4px;
-    border: 1px solid #e5dfc7;
+    border: 1px solid #eaeaea;
     float: left;
     display: block;
     width: 100px;
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 5a9ea3830..05c9ca244 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1874,9 +1874,9 @@ div.tableline{
    font-size: 12px;
    color: #fff;
    padding: 3px 9px;
-   background: #15bccf;
+   background: #269ac9;
    border-radius: 4px;
-   border: 1px solid #15bccf;
+   border: 1px solid #269ac9;
    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
    cursor: pointer;