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

Jump to bottom

Simple editor template #6817

Closed
wants to merge 26 commits into from
Closed

Simple editor template #6817

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
376c5d1
simple editor skeleton
cesswairimu Nov 19, 2019
2ab8958
rearrange elements to match new design
cesswairimu Nov 21, 2019
24c8208
screenshot test
cesswairimu Nov 21, 2019
4012127
fix routing
cesswairimu Nov 23, 2019
1293d2e
check if travis will pass :see_no_evil:
cesswairimu Nov 27, 2019
502ce33
solve merge conflicts
cesswairimu Jan 9, 2020
90c8580
change route path
cesswairimu Nov 27, 2019
a87bc25
test using path in visit
cesswairimu Nov 27, 2019
4125564
add route backWq
cesswairimu Nov 28, 2019
ab814a9
add more tests
cesswairimu Nov 28, 2019
f299ef7
add tags in editor
cesswairimu Nov 29, 2019
4020cfd
more styling
cesswairimu Nov 29, 2019
a7eb89c
remove top title
cesswairimu Dec 12, 2019
dd944a4
remove top title and numbering
cesswairimu Dec 12, 2019
af843b4
fix tests
cesswairimu Dec 16, 2019
c531607
hide tags
cesswairimu Dec 17, 2019
fac9559
remove/hide unused sectionswq
cesswairimu Dec 17, 2019
8cce022
redesign image upload section
cesswairimu Dec 17, 2019
161f5f1
maximize width
cesswairimu Dec 19, 2019
64cd326
redesign image upload div
cesswairimu Dec 22, 2019
3b2f71c
add placename
cesswairimu Jan 21, 2020
2e75072
remove navbar for simple post
cesswairimu Jan 25, 2020
f798c83
fix failing test
cesswairimu Jan 25, 2020
62302d7
rename edit link
cesswairimu May 3, 2020
dc9ffb6
have "edit link" in lowercase
cesswairimu May 3, 2020
a24f08f
Update simple.html.erb
jywarren Oct 12, 2020
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
Prev Previous commit
Next Next commit
add route backWq
  • Loading branch information
@cesswairimu
cesswairimu committed Dec 21, 2020
commit 4125564da019c229f6b2250531c2f9c672ed425c
14 changes: 7 additions & 7 deletions app/views/editor/simple.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<style type="text/css">
.leaflet-marker-icon {
background: url("https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-black.png") ;
background: url("https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-black.png") ;
}
</style>

Expand Down Expand Up @@ -166,11 +166,11 @@
</div>

<div class="ple-module-content row col-lg-9">
<div class="ple-drag-drop col-lg-6">Drag an image here to upload.</div>
<div class="ple-drag-drop col-lg-6">Add a photo</div>
<div class="col-lg-6 help">
<div style="display:none;" class="progress">
<div
class="progress-bar progress-bar-striped progress-bar-animated"
class="progress-bar progress-bar-striped progress-bar-animated"
role="progressbar"
aria-valuenow="0"
aria-valuemin="0"
Expand Down Expand Up @@ -202,9 +202,9 @@
<h2>4</h2>
</div>

<div class="ple-module-content col-lg-9">
<div class="ple-module-content col-lg-6">
<h5>Give your post a title</h5>
<input
<input
class="form-control input-lg"
type="text"
id="title-input"
Expand All @@ -216,7 +216,7 @@
</div>
<!-- end title module -->
<div class="text-center">
<%= link_to "Help", "", class: 'btn btn-lg btn-secondary' %>
<%= link_to "Help", "", class: 'btn btn-lg btn-outline-secondary' %>
<button class="ple-publish btn btn-lg btn-primary disabled"><% if controller.action_name == "edit" && @node.status == 3 %>Save<% else %>Post<% end %></button>
</div>

Expand All @@ -232,7 +232,7 @@
</div>

<button class="btn btn-lg btn-outline-secondary btn-more">...</button>

<span> &nbsp; By publishing, you agree to <a href="https://publiclab.org/licenses">open source your work</a><span class="d-none d-md-inline"> so that others may use it.</span></span>
<span class="ple-help float-right">
<% if controller.action_name != "edit" && !current_user.first_time_poster %>
Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@
get 'post' => 'editor#post', :as => :editor_post
post 'post' => 'editor#post', :as => :editor_path
get 'post/choose' => 'editor#choose'
get '/post/simple' => 'editor#simple', :as => :simple_editor
get '/simple_post' => 'editor#simple', :as => :simple_editor
get 'legacy' => 'editor#legacy'
get 'editor' => 'editor#editor'
get 'editor/rich/(:n)' => 'editor#rich'
Expand Down