From 9c3ff516333251dbaec515fa992af83d807772bd Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 23 Jul 2014 11:03:43 +0800 Subject: [PATCH] remove useless navbar method called --- ReadMe.txt | 71 ++++++++++++------------ app/helpers/application_helper.rb | 2 +- doc/Automated testing documentation.doc | Bin 1441280 -> 1451008 bytes 3 files changed, 35 insertions(+), 38 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index 2505c295b..c373119fb 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,19 +1,8 @@ -patch: -用户姓名的部分，根据issues#655。 -为了修改方便 -alias： -方法 之前显示 调整之后 -name firstname+lastname login -nickname xxx login -realname xxx firstname+lastname +===================================[2014-04-09]================================= +kw: 域名, 二级域名, subdomain, forge, course, contest +域名跳转（forge/course/contest）这几个设置在settings.yml中 +但是跳转在development模式下会导致无法开发 -User model经过修改，已经完全集成了user_extensions的功能 -例如 -user.gender=1 -user.save -user_extensions字段会自动保存 -不必要每次user.user_extensions.xxx以及判断是否为空 -================================================================================ app/models/setting.rb :165 # fixed domain url in development. tantantan's bug if Rails.env.development? @@ -23,36 +12,40 @@ app/models/setting.rb :165 end 程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。 为了开发方便，使之功能在development模式下失效。 - # => nyan -================================================================================ -app/controller/projects_controller.rb ===> projects#fake - fake filter: 修改了传到页面中的Count后缀的数量 - 改为正确的数量，删掉fake过滤器即可 -================================================================================ + + +===================================[2014-04-09]================================= +kw: 菜单, 导航栏, layout +网页上方的导航条没有用Redmine::MenuManager +MenuManager的样式无法定制，菜单显示条件if中的proc执行行为没有了解 + #导航栏匹配域名显示和改变 app\helper\application_helper.rb -# rewrite navigation +render_dynamic_nav 方法中，利用变量，可以设置在layout中具体显示哪些条目 app\views\layouts\_base_header.html.erb -# reset navigation by domain name and url through regular match -================================================================================ +需要显示的条目，由具体的实例变量设置（在各个layout中） + + +===================================[2014-04-09]================================= +kw: home_path, 首页, 跳转, 二级域名, welcome #首页根据域名匹配进入不同的页面 app\controller\welcome_controller.rb - def entry_select_user - if request.original_url.match(/user\.trustie\.net/) - redirect_to(:controller => "users", :action => "index") - return 0 - end - end -================================================================================ +#entry_select 放射设置二级域名所显示的首页 -================================================================================ -0606：新坑 + + +===================================[2014-06-06]================================= +kw: user_scores user_scores表结构有问题，需要运行 bundle exec rake db:migrate:down VERSION=20140410021724 bundle exec rake db:migrate:up VERSION=20140410021724 -=============================================================================== -0708：CKEditor插件加载方法 + + + +===================================[2014-07-08]================================= +kw: CKEditor, 富文本, 编辑器 +CKEditor插件加载方法 1.把插件文件夹拷入plugins文件夹，确保文件夹名为redmine_ckeditor 2.运行 bundle install --without development test 3.运行 rake redmine:plugins:migrate RAILS_ENV=production @@ -60,8 +53,12 @@ bundle exec rake db:migrate:up VERSION=20140410021724 5.配置CKEditor插件(Administration > Plugins > Configure) 6.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor 注意：一定要先配置CKEditor插件再见文本格式更改，不然，数据库不会生成对应记录，会报错。。 -=============================================================================== -0719：若遇到首页定制报错问题请尝试如下操作 + + + +===================================[2014-07-19]================================= +kw: 首页, 定制, forge, course, contest, 排序 +若遇到首页定制报错问题请尝试如下操作 如果运行迁移文件有报错与‘sort_type’相关 先运行 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202 在按如下步骤执行，未报与之相关的则直接按如下步骤执行 1.运行 bundle exec rake db:migrate:down version=20140719080032 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4967505a3..b6cd47924 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1703,7 +1703,7 @@ module ApplicationHelper def render_dynamic_nav home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'} home_link = "
  • " << home_link << "
    • " - bootstrap_render_dynamic_nav + # bootstrap_render_dynamic_nav content_tag :ul, (home_link.html_safe+bootstrap_render_dynamic_nav) end diff --git a/doc/Automated testing documentation.doc b/doc/Automated testing documentation.doc index 994dd0c183d2b5d82b3531d2ee7914851514c011..faee8d8896b2eb76e98065278de48f842919bc92 100644 GIT binary patch delta 16021 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 JeJN4=zX76JK)?V1 delta 8172 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 wk6!Mjc6im