gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge b034d049da into 636eb40499

Browse source
This commit is contained in:
Rishabh Saxena 2016-03-07 09:50:42 +00:00
commit 5368a7eb51
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/tickets/_form.html.haml
View file

@ -10,7 +10,7 @@
.col-md-8 .col-md-8
= semantic_form_for(@ticket, :url => (@ticket.new_record? ? admin_conference_tickets_path : admin_conference_ticket_path(@conference.short_title, @ticket))) do |f| = semantic_form_for(@ticket, :url => (@ticket.new_record? ? admin_conference_tickets_path : admin_conference_ticket_path(@conference.short_title, @ticket))) do |f|
= f.input :title = f.input :title
= f.input :description, input_html: { rows: 5, data: { provide: "markdown-editable" } } = f.input :description, input_html: { rows: 5, data: { provide: "markdown" } }
= f.input :price = f.input :price
= f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY'], include_blank: false = f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY'], include_blank: false
%p.text-right %p.text-right

2
app/views/admin/users/index.html.haml
View file

@ -6,7 +6,7 @@
- if @users - if @users
= "(#{@users.length})" = "(#{@users.length})"
.row .row
.col-md-12 .col-md-12.table-responsive
%table.table.table-striped.table-bordered.table-hover.datatable %table.table.table-striped.table-bordered.table-hover.datatable
%thead %thead
%th ID %th ID

5
vendor/assets/javascripts/bootstrap-markdown.js vendored
View file

@ -143,8 +143,9 @@
this.$textarea this.$textarea
.on('focus', $.proxy(this.focus, this)) .on('focus', $.proxy(this.focus, this))
.on('keypress', $.proxy(this.keypress, this)) .on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this)) /* options muted to repair markdown editable issue */
.on('change', $.proxy(this.change, this)) //.on('keyup', $.proxy(this.keyup, this))
//.on('change', $.proxy(this.change, this))
if (this.eventSupported('keydown')) { if (this.eventSupported('keydown')) {
this.$textarea.on('keydown', $.proxy(this.keydown, this)) this.$textarea.on('keydown', $.proxy(this.keydown, this))