jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复

This commit is contained in:
z9hang 2014-07-18 16:39:39 +08:00
parent 057447f810
commit bd43ef5d61
29 changed files with 129 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -507,7 +507,7 @@ class UsersController < ApplicationController
@user.password = @user.password_confirmation = nil
respond_to do |format|
format.html { render :action => 'new' }
format.html { render :action => 'new',:layout => "base" }
format.api { render_validation_errors(@user) }
end
end

5
app/views/account/login.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<%= call_hook :view_account_login_top %>
<script type="text/javascript" language="javascript">

5
app/views/account/lost_password.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<h3><%=l(:label_password_lost)%></h3>
<%= form_tag(lost_password_path) do %>

5
app/views/account/register.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!-- added by bai 增加地区-->
<script type="text/javascript" language="javascript">
function showcity(province, cityField) {

5
app/views/bids/index.html.erb
View File

@ -1,3 +1,8 @@
<%
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
@nav_dispaly_forum_label = 1
%>
<!-- fq -->
<!-- modified by huang -->
<div class="top-content">

5
app/views/bids/new_bid.html.erb
View File

@ -1,3 +1,8 @@
<%
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
@nav_dispaly_forum_label = 1
%>
<!-- fq -->
<h3><%=l(:label_new_call)%></h3>

4
app/views/forums/index.html.erb
View File

@ -1,3 +1,7 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<!-- added by fq -->
<div class="top-content">
<table width="940px">

5
app/views/forums/new.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!-- added by fq -->
<h3><%= l :label_forum_new %></h1>

38
app/views/layouts/_base_header.html.erb
View File

@ -2,29 +2,29 @@
request.headers['REQUEST_URI'] = "" if request.headers['REQUEST_URI'].nil?
realUrl = request.original_url
if (realUrl.match(/.*forge\.trustie\.net\/*/))
@nav_dispaly_project_label = 1
@nav_dispaly_forum_label = 1
#@nav_dispaly_project_label = 1
#@nav_dispaly_forum_label = 1
elsif (realUrl.match(/.*course\.trustie\.net\/*/))
@nav_dispaly_course_all_label = 1
@nav_dispaly_forum_label = 1
@nav_dispaly_course_label = nil
@nav_dispaly_store_all_label = 1
#@nav_dispaly_course_all_label = 1
#@nav_dispaly_forum_label = 1
#@nav_dispaly_course_label = nil
#@nav_dispaly_store_all_label = 1
elsif (realUrl.match(/.*user\.trustie\.net\/*/))
@nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1
#@nav_dispaly_home_path_label = 1
#@nav_dispaly_main_course_label = 1
#@nav_dispaly_main_project_label = 1
#@nav_dispaly_main_contest_label = 1
elsif (realUrl.match(/.*contest\.trustie\.net\/*/))
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
#@nav_dispaly_contest_label = 1
#@nav_dispaly_store_all_label = 1
else
@nav_dispaly_project_all_label = 1
@nav_dispaly_course_all_label = 1
@nav_dispaly_forum_label = 1
@nav_dispaly_bid_label = 1
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
@nav_dispaly_user_label = 1
#@nav_dispaly_project_all_label = 1
#@nav_dispaly_course_all_label = 1
#@nav_dispaly_forum_label = 1
#@nav_dispaly_bid_label = 1
#@nav_dispaly_contest_label = 1
#@nav_dispaly_store_all_label = 1
#@nav_dispaly_user_label = 1
end
%>
<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">

5
app/views/layouts/base_admin.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!DOCTYPE html>
<html lang="<%= current_language %>">
<head>

4
app/views/layouts/base_bids.html.erb
View File

@ -1,4 +1,6 @@
<% @nav_dispaly_bid_label = 1 %>
<% @nav_dispaly_forum_label = 1
@nav_dispaly_bid_label = 1 %>
<!DOCTYPE html>
<html lang="en">
<head>

7
app/views/layouts/base_contest.html.erb
View File

@ -1,4 +1,7 @@
<% @nav_dispaly_contest_label = 1 %>
<%
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
%>
<!DOCTYPE html>
<html lang="en">
<head>
@ -20,7 +23,7 @@
<div id="wrapper">
<div id="wrapper2">
<div id="wrapper3">
<%=render :partial => 'layouts/base_header'%>
<%=render :partial => 'layouts/base_header'%>
<div id="main" class="">
<!-- added by bai -->
<div class="top-content">

5
app/views/layouts/base_courses.html.erb
View File

@ -1,4 +1,7 @@
<% #@nav_dispaly_course_label = 1 %>
<% @nav_dispaly_course_all_label = 1
@nav_dispaly_forum_label = 1
@nav_dispaly_course_label = nil
@nav_dispaly_store_all_label = 1 %>
<!DOCTYPE html>
<html lang="en">
<head>

4
app/views/layouts/base_forums.html.erb
View File

@ -1,3 +1,7 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!DOCTYPE html>
<html lang="en">

5
app/views/layouts/base_homework.html.erb
View File

@ -1,4 +1,7 @@
<% @nav_dispaly_course_label = 1 %>
<% @nav_dispaly_course_all_label = 1
@nav_dispaly_forum_label = 1
@nav_dispaly_course_label = nil
@nav_dispaly_store_all_label = 1 %>
<!DOCTYPE html>
<html lang="en">
<head>

4
app/views/layouts/base_memos.html.erb
View File

@ -1,3 +1,7 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!DOCTYPE html>
<html lang="en">

5
app/views/layouts/base_newcontest.html.erb
View File

@ -1,4 +1,7 @@
<% @nav_dispaly_contest_label = 1 %>
<%
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
%>
<!DOCTYPE html>
<html lang="en">
<head>

2
app/views/layouts/base_projects.html.erb
View File

@ -1,3 +1,5 @@
<% @nav_dispaly_project_label = 1
@nav_dispaly_forum_label = 1 %>
<% #@nav_dispaly_project_label = 1 %>
<!DOCTYPE html>
<html lang="en">

5
app/views/layouts/base_users.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<% @nav_dispaly_user_label = show_item_on_navbar(params) %>
<!DOCTYPE html>
<html lang="en">

5
app/views/memos/new.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!-- <h1>New memo</h1> -->
<%= javascript_include_tag "ckeditor/ckeditor.js" %>
<div class="top-content">

5
app/views/my/account.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<script type="text/javascript">
$(document).ready(
function () {

2
app/views/projects/new.html.erb
View File

@ -1,3 +1,5 @@
<% @nav_dispaly_project_label = 1
@nav_dispaly_forum_label = 1 %>
<%= labelled_form_for @project do |f| %>
<!--Added by young-->
<% if @course_tag == '1' %>

5
app/views/users/index.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<!-- modified by huang -->
<script type="text/javascript">
function searchUser(){

5
app/views/users/new.html.erb
View File

@ -1,3 +1,8 @@
<% @nav_dispaly_home_path_label = 1
@nav_dispaly_main_course_label = 1
@nav_dispaly_main_project_label = 1
@nav_dispaly_main_contest_label = 1 %>
<% @nav_dispaly_forum_label = 1%>
<h3><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h3>
<%= labelled_form_for @user do |f| %>

4
app/views/users/show.html.erb
View File

@ -80,9 +80,9 @@
<tr>
<% if act.reward_type ==3 %>
<% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id),host: Setting.course_domain%></td>
<% else %>
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp; <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp; <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id),host: Setting.course_domain %></td>
<% end %>
<% else %>
<% if e.user == User.current%>

4
app/views/welcome/contest.html.erb
View File

@ -1,3 +1,7 @@
<%
@nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1
%>
<%= stylesheet_link_tag 'welcome' %>
<script type="text/javascript" language="javascript">
function clearInfo(id, content) {

4
app/views/welcome/course.html.erb
View File

@ -1,3 +1,7 @@
<% @nav_dispaly_course_all_label = 1
@nav_dispaly_forum_label = 1
@nav_dispaly_course_label = nil
@nav_dispaly_store_all_label = 1 %>
<%= stylesheet_link_tag 'welcome' %>
<%= javascript_include_tag 'welcome' %>
<script type="text/javascript" language="javascript" xmlns="http://www.w3.org/1999/html"

2
app/views/welcome/index.html.erb
View File

@ -1,3 +1,5 @@
<% @nav_dispaly_project_label = 1
@nav_dispaly_forum_label = 1 %>
<%= stylesheet_link_tag 'welcome' %>
<%= javascript_include_tag 'welcome' %>
<script type="text/javascript" language="javascript">

2
public/themes/redpenny-master/stylesheets/application.css
View File

@ -50,7 +50,7 @@ only screen and (min-device-pixel-ratio: 2) {
body,#wrapper
{
background-color:#fff; /*整体背景色ecfffb*/
background-color:#F6F7F8;/*fff整体背景色ecfffb*/
font-family:'微软雅黑',Helvetica,Arial,"Lucida Grande",verdana,sans-serif
}