Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redundant getting started removed #2235

Merged
merged 1 commit into from
Feb 5, 2018
Merged

Redundant getting started removed #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions app/views/wiki/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<div class="sidebar-nav hidden-sm">
<ul class="nav nav-list">
<li class="nav-header"><%= t('wiki.edit.more') %></li>
<li><a href="/wiki/getting-started"><%= t('wiki.edit.getting_started') %></a></li>
<% if @node.path %><li><a href="/wiki/revisions/<%= @node.slug_from_path %>"><%= t('wiki.edit.revisions_for_this_page') %></a></li><% end %>
<li><a href="/wiki/posting-research"><%= t('wiki.edit.about_posting_research') %></a></li>
<li><a href="/wiki/authoring-help#Advanced+formatting"><%= t('wiki.edit.advanced_formatting') %></a></li>
Expand All @@ -41,7 +40,7 @@
<%= form_for :revision, :as => :revision, :url => url, :html => {:class => "form well wiki-form"} do |f| %>

<% if f.error_messages != "" %><div class="alert alert-danger"><%= f.error_messages %></div><% end %>

<%= render :partial => "editor/main_image" %>

<div class="col-md-9 col-md-pull-3">
Expand All @@ -51,17 +50,17 @@
<% else %>
<h3><%= t('wiki.edit.create_page') %>: <i><%=h params[:id] %></i></h3>
<% end %>

<input id="has_main_image" type="hidden" name="has_main_image" value="<% if @node && @node.main_image %>true<% end %>" />
<input id="main_image" type="hidden" name="main_image" value="<% if @node && @node.main_image(:rails) %><%= @node.main_image(:rails).id %><% else %><%= params[:main_image] %><% end %>" />
<input id="images_input" type="hidden" name="images" value="" />

<input id="taginput" type="hidden" name="tags" value="<%= params[:tags] %>" />

<div class="form-group">
<input tabindex="1" name="title" type="text" class="form-control" id="title" value="<% if @node && @node.latest %><%= @node.latest.title %><% else %><%= params[:id] %><% end %>">
</div>

<script>
(function(){
$D = {
Expand All @@ -70,9 +69,9 @@
}
})()
</script>

<%= render :partial => 'editor/editor' %>

<a id="publish" tabindex="5" class="publish btn btn-primary btn-lg"><%= t('wiki.edit.publish') %></a>
<a tabindex="6" data-previewing-text="<%= t('wiki.edit.previewing_text') %>" class="btn btn-default btn-lg preview-btn" onClick="$E.toggle_preview()"><%= t('wiki.edit.preview') %></a>
<a class="btn btn-default btn-lg" href="/wiki/<%= params["id"] %>">Cancel</a>
Expand Down
1 change: 0 additions & 1 deletion test/integration/I18n_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ class I18nTest < ActionDispatch::IntegrationTest

wiki = nodes(:about)
get '/wiki/edit/' + wiki.title.parameterize
assert_select 'a', I18n.t('wiki.edit.getting_started')
end
end

Expand Down