Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop'

  • Loading branch information...
commit a596c2c5fdec49d8aa4d38142fd94b04761b19ad 2 parents 3438562 + 2837db5
@eirworks authored
View
5 app/views/library/_custom_css.html.haml
@@ -12,4 +12,9 @@
header {
border-bottom-color:##{t[1]};
+ }
+
+ .layout-template-story-content {
+ font-size:#{t[3]}em;
+ font-color:##{t[2]};
}
View
17 app/views/library/_pagination.html.haml
@@ -0,0 +1,17 @@
+- unless @story.onechapter
+ %hr.space/
+ .layout-template-pagination
+ - chapter_number = (params[:chapter_number] ? params[:chapter_number].to_i : 1 )
+ .pagi-prev
+ - if chapter_number.to_i > 1
+ %span.arrow ←
+ = link_to 'Sebelumnya', read_path(:story_id => @story.id, :slug => slugging(@story.title), :chapter_number => chapter_number - 1), :class => 'pagination'
+ - else
+  
+ .pagi-next
+ - if Chapter.count(:all, :conditions => ['story_id = ? and id > ?',@story.id,@chapter.id]) > 0
+ = link_to 'Selanjutnya', read_path(:story_id => @story.id , :slug => slugging(@story.title), :chapter_number => chapter_number + 1)
+ %span.arrow →
+ - else
+  
+
View
32 app/views/library/read.html.haml
@@ -13,36 +13,16 @@
bergenre
= link_to @story.genre.name, genre_path(:genre_alias => @story.genre.alias)
%hr.space/
- - if @story.theme
- - t = @story.theme
- - style = "font-color:##{t[2]};"
- - style += "font-size:#{}em;"
- - else
- - style = ""
- %article.content{:style => style }
+ %article.content
= render 'nsfw_warning' if @story.warning
.layout-template-nsfw-protector{'data-nsfw' => (@story.warning && (cookies[:iamaadult] != 'true') ? 'true' : 'false')}
- .layout-template-story-content
+ .layout-template-story-container
%h2= @story.onechapter ? @story.title : @chapter.title
= render 'social_part'
- :plain
- #{@chapter.html}
- - unless @story.onechapter
- %hr.space/
- .layout-template-pagination
- - chapter_number = (params[:chapter_number] ? params[:chapter_number].to_i : 1 )
- .pagi-prev
- %span.arrow ←
- - if chapter_number.to_i > 1
- = link_to 'Sebelumnya', read_path(:story_id => @story.id, :slug => slugging(@story.title), :chapter_number => chapter_number - 1), :class => 'pagination'
- - else
- Sebelumnya
- .pagi-next
- - if Chapter.count(:all, :conditions => ['story_id = ? and id > ?',@story.id,@chapter.id]) > 0
- = link_to 'Selanjutnya', read_path(:story_id => @story.id , :slug => slugging(@story.title), :chapter_number => chapter_number + 1)
- - else
- Selanjutnya
- %span.arrow →
+ .layout-template-story-content
+ :plain
+ #{@chapter.html}
+ = render 'pagination'
%hr.space/
%footer{:style=>'text-align:center;'}
Cerita ini hanya fiksi, semua kesamaan nama, tempat, waktu, dan kejadian cuma kebetulan saja.
View
2  app/views/stories/_form.html.haml
@@ -52,7 +52,7 @@
%span.rectangle{:id => 'theme-font-color-preview', :style => "background-color:##{@story.theme[2]};"}
%br/
= f.label "Ukuran huruf"
- = select_tag 'story[theme][]', options_for_select([["Kecil",'.85'],["Normal",'1'],["Besar",'1.4']],@story.theme[3]), :id => 'theme-font-size'
+ = select_tag 'story[theme][]', options_for_select([["Kecil",'.85'],["Normal",'1'],["Besar",'1.2']],@story.theme[3]), :id => 'theme-font-size'
=# text_field_tag 'story[theme][]', @story.theme[3], :style => 'width:30px;', :placeholder => @story.theme[3]
%br/
= link_to 'reset', 'javascript:;', :id => 'theme-reseter'
View
4 app/views/stories/show.html.haml
@@ -15,6 +15,10 @@
%span
= image_tag('icons/globe_normal.svg', :size => '15x15')
= link_to 'dipublikasikan', publish_story_path(:story_id => @story), :title => 'Dapat dibaca oleh semua orang di dunia. Klik untuk menyembunyikannya dari perpustakaan'
+ \|
+ %strong
+ = link_to 'baca di perpus', read_path(:story_id => @story.id, :slug => slugging(@story.title))
+ ⇒
-else
%span
= image_tag('icons/globe_blur.svg', :size => '15x15')
View
2  public/javascripts/application.js
@@ -47,7 +47,7 @@ $(document).ready(function(){
$('.nsfw-pass').click(function(event){
$('.layout-template-nsfw-protector').slideDown();
$('.layout-template-nsfw-warning').hide();
- $.cookie('iamaadult','true');
+ $.cookie('iamaadult','true', {path : '/'});
});
$('.bg-chooser').change(function(){
Please sign in to comment.
Something went wrong with that request. Please try again.