developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

breadcrumb widget of back-end has done, front-end has bug... 

Conflicts:

	app/controllers/front_controller.rb
	app/views/front/show_breadcrumb.html.erb
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
This commit is contained in:
Rueshyna 2013-02-02 01:24:19 +08:00 committed by chris
parent 29b8fec89a
commit f3bfe67e68
2 changed files with 102 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/parsers/parser_common.rb
View File

@ -207,7 +207,10 @@ module ParserCommon
'' ''
end end
end end
<<<<<<< HEAD
=======
>>>>>>> cf956ac... breadcrumb widget of back-end has done, front-end has bug...
# sitemap # sitemap
def parse_sitemaps_edit(body = nil, page = nil, edit=nil) def parse_sitemaps_edit(body = nil, page = nil, edit=nil)
sitemap = body.css('sitemap').first sitemap = body.css('sitemap').first

99
vendor/built_in_modules/personal_journal/Gemfile.lock vendored Normal file
View File

@ -0,0 +1,99 @@
PATH
remote: .
specs:
personal_journal (0.0.1)
rails (~> 3.1.4)
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.9)
actionpack (= 3.1.9)
mail (~> 2.3.3)
actionpack (3.1.9)
activemodel (= 3.1.9)
activesupport (= 3.1.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.9)
activesupport (= 3.1.9)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.9)
activemodel (= 3.1.9)
activesupport (= 3.1.9)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
activeresource (3.1.9)
activemodel (= 3.1.9)
activesupport (= 3.1.9)
activesupport (3.1.9)
multi_json (>= 1.0, < 1.3)
arel (2.2.3)
builder (3.0.4)
erubis (2.7.0)
hike (1.2.1)
i18n (0.6.1)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.2.0)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.1.9)
actionmailer (= 3.1.9)
actionpack (= 3.1.9)
activerecord (= 3.1.9)
activeresource (= 3.1.9)
activesupport (= 3.1.9)
bundler (~> 1.0)
railties (= 3.1.9)
railties (3.1.9)
actionpack (= 3.1.9)
activesupport (= 3.1.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
PLATFORMS
ruby
DEPENDENCIES
jquery-rails
personal_journal!
sqlite3