diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index 8a479028..5842510d 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -30,4 +30,4 @@ _ready = -> sweetAlertInitialize() $(document).ready _ready -$(document).on 'page:load', _ready \ No newline at end of file +$(document).on 'page:load', _ready diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee index a8f02627..397fb515 100644 --- a/app/assets/javascripts/inbox.coffee +++ b/app/assets/javascripts/inbox.coffee @@ -57,7 +57,7 @@ $(document).on "keydown", "textarea[name=ib-answer]", (evt) -> iid = $(this)[0].dataset.id - if evt.keyCode == 13 and evt.ctrlKey + if evt.keyCode == 13 and (evt.ctrlKey or evt.metaKey) # trigger warning: $("button[name=ib-answer][data-ib-id=#{iid}]").trigger 'click' @@ -120,4 +120,4 @@ $(document).on "click", "button[name=ib-destroy]", -> showNotification "An error occurred, a developer should check the console for details", false complete: (jqxhr, status) -> btn.button "reset" - $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly" \ No newline at end of file + $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly" diff --git a/app/assets/javascripts/questionbox/all.coffee b/app/assets/javascripts/questionbox/all.coffee index 9178123b..ab3a8e70 100644 --- a/app/assets/javascripts/questionbox/all.coffee +++ b/app/assets/javascripts/questionbox/all.coffee @@ -22,8 +22,12 @@ $(document).on "click", "button[name=qb-all-ask]", -> btn.button "reset" $("textarea[name=qb-all-question]").removeAttr "readonly" +# hotkey for accessing this quickly +$(document).on "keydown", (evt) -> + if evt.keyCode == 77 and (evt.ctrlKey or evt.metaKey) + $('.btn[name=toggle-all-ask]').trigger 'click' # see GitHub issue #2 ($ document).on "keydown", "textarea[name=qb-all-question]", (evt) -> - if evt.keyCode == 13 and evt.ctrlKey - ($ "button[name=qb-all-ask]").trigger 'click' \ No newline at end of file + if evt.keyCode == 13 and (evt.ctrlKey or evt.metaKey) + ($ "button[name=qb-all-ask]").trigger 'click' diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 58c371a9..a3835231 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -25,7 +25,7 @@ = render "layouts/notifications" %ul.nav.navbar-nav.navbar-right %li - .btn.btn-primary.navbar-btn.btn-sm.hidden-xs{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"} + .btn.btn-primary.navbar-btn.btn-sm.hidden-xs{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"} %i.fa.fa-pencil-square-o %li.dropdown %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"} diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ae6a322a..4306477a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,5 +1,5 @@ !!! 5 -%html +%html{lang: 'en'} %head %meta{charset: 'utf-8'} %meta{'http-equiv' => 'X-UA-Compatible' ,content: 'IE=edge'} @@ -42,4 +42,4 @@ })(); %noscript %p - %img{:alt => "", :src => "//stat.rrerr.net/piwik.php?idsite=9", :style => "border:0;"}/ \ No newline at end of file + %img{:alt => "", :src => "//stat.rrerr.net/piwik.php?idsite=9", :style => "border:0;"}/ diff --git a/app/views/shared/_comments.html.haml b/app/views/shared/_comments.html.haml index 9cc96775..e8ee64d2 100644 --- a/app/views/shared/_comments.html.haml +++ b/app/views/shared/_comments.html.haml @@ -25,7 +25,8 @@ %a{href: '#', data: { action: 'ab-comment-report', c_id: comment.id }} %i.fa.fa-exclamation-triangle Report - %p.comments--content= comment.content + .comments--content + = markdown comment.content - if user_signed_in? .form-group.has-feedback{name: 'ab-comment-new-group', data: { a_id: a.id }} %input.form-control.comments--box{type: :text, placeholder: 'Comment...', name: 'ab-comment-new', data: {a_id: a.id }} diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml index 1fec6531..dec0f59e 100644 --- a/app/views/shared/_links.html.haml +++ b/app/views/shared/_links.html.haml @@ -3,4 +3,7 @@ = Date.today.year = APP_CONFIG['site_name'] · - = link_to "About", about_path \ No newline at end of file + = link_to "About", about_path + · + = link_to "Bugs", 'https://github.com/retrospring/bugs/issues' + diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml index cf86eac8..01b60fb2 100644 --- a/app/views/user/_profile_info.html.haml +++ b/app/views/user/_profile_info.html.haml @@ -25,7 +25,7 @@ .profile--username = @user.screen_name - unless @user.bio.blank? - %p.profile--text= @user.bio + %p.profile--text= markdown @user.bio - unless @user.website.blank? %p.profile--text %i.fa.fa-globe