cafe-grader-web Commit - r563:589243c81dda

cafe-grader-web

Commit `r563:589243c81dda` public

parent | child

Description:

* add button size option to toggle_button helper

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r563:589243c81dda - Wed, 29 Jun 2016 06:58:31 - 2 files changed: 7 inserted, 6 deleted

app/helpers/application_helper.rb ¶ +6 -5

                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
-            -   def toggle_button(on,toggle_url,id)
+            +   def toggle_button(on,toggle_url,id, option={})
-            -       link_to (on ? "Yes" : "No"), toggle_url,
+            +     btn_size = option[:size] || 'btn-xs'
-            -         {class: "btn btn-block btn-xs btn-#{on ? 'success' : 'default'} ajax-toggle",
+            +     link_to (on ? "Yes" : "No"), toggle_url,
-            -          id: id,
+            +       {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
-            -          data: {remote: true, method: 'get'}}
+            +         id: id,
+            +         data: {remote: true, method: 'get'}}
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end

app/views/announcements/index.html.haml ¶ +1 -1

               %table.table.table-striped
                 %tr
                   %th Updated
                   %th Announcement
                   %th Author
                   %th Published
                   %th
                   %th
                 - for announcement in @announcements
                   %tr
                     - @announcement = announcement
                     %td= time_ago_in_words announcement.updated_at
                     %td
                       - if !announcement.title.blank?
                         %b Title:
                         = h announcement.title
                         %br/
                       - if !announcement.notes.blank?
                         %b
                           Notes: #{h announcement.notes}
                         %br/
                       = h announcement.body
                     %td= h announcement.author
-            -       %td= toggle_button(announcement.published?, toggle_announcement_url(@announcement), "announcement_toggle_#{@announcement.id}")
+            +       %td= toggle_button(announcement.published?, toggle_announcement_url(@announcement), "announcement_toggle_#{@announcement.id}", {size: 'btn-sm'})
                     //%td= link_to (announcement.published? ? "Yes" : "No"), url_for(controller: :announcements, action: :toggle, id: announcement), { class: "btn btn-block btn-sm btn-#{(announcement.published? ? 'success' : 'default')} ajax-toggle", id: "published-#{announcement.id}", data: {remote: true, method: 'post' } }
                     %td= link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-block btn-sm btn-info'
                     %td= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete, class: "btn btn-block btn-sm btn-danger"
               %br
               = link_to '+ Add announcement', new_announcement_path, class: 'btn btn-success'

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Commit r563:589243c81dda public

Author

r563:589243c81dda - Wed, 29 Jun 2016 06:58:31 - 2 files changed: 7 inserted, 6 deleted

Commit `r563:589243c81dda` public