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

Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

This commit is contained in:
Fu Matthew 2012-12-27 15:06:19 +08:00
parent 2dd0f9a9d2 9e07794cbc
commit 2901b8e30c
5 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/admin/items_helper.rb
View File

@ -32,7 +32,7 @@ module Admin::ItemsHelper
if !parent.children.entries.blank? if !parent.children.entries.blank?
ret = '' ret = ''
ret << "<ol class='#{'sortable' if parent.parent.nil?}'>" ret << "<ol class='#{'sortable' if parent.parent.nil?}'>"
children.each do |child| children.reverse.each do |child|
ret << render_node_and_children(child) ret << render_node_and_children(child)
end end
ret << '</ol>' ret << '</ol>'

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

@ -30,7 +30,7 @@
<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" /> <input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
<input type='hidden' name='domains' value='<%= @site.search["domains"] rescue ''%>'> <input type='hidden' name='domains' value='<%= @site.search["domains"] rescue ''%>'>
<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'> <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%> <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_google) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
</form> </form>
</li> </li>
<% if user_signed_in? %> <% if user_signed_in? %>

2
lib/orbit_core_lib.rb
View File

@ -140,7 +140,7 @@ module OrbitCoreLib
protected protected
def generate_token def generate_token
self.s_token = ActiveSupport::SecureRandom.hex(16) self.s_token = SecureRandom.hex(16)
self.save! self.save!
end end
end end