diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index 5a124b5c393581508f19f8b012fa568eab1cc1b0..3d05fb8aff2e959afedcf6a15696e77f11d5c50d 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -19,6 +19,7 @@ app.views.Publisher = Backbone.View.extend({ "focus textarea" : "open", "click #hide_publisher" : "clear", "submit form" : "createStatusMessage", + "click #submit" : "createStatusMessage", "click .post_preview_button" : "createPostPreview", "textchange #status_message_fake_text": "handleTextchange", "click #locator" : "showLocation", @@ -33,7 +34,7 @@ app.views.Publisher = Backbone.View.extend({ this.el_input = this.$('#status_message_fake_text'); this.el_hiddenInput = this.$('#status_message_text'); this.el_wrapper = this.$('#publisher_textarea_wrapper'); - this.el_submit = this.$('input[type=submit]'); + this.el_submit = this.$('input[type=submit], button#submit'); this.el_preview = this.$('button.post_preview_button'); this.el_photozone = this.$('#photodropzone'); @@ -260,7 +261,7 @@ app.views.Publisher = Backbone.View.extend({ keyDown : function(evt) { if( evt.keyCode == 13 && evt.ctrlKey ) { - this.$("form").submit(); + this.el_submit.click(); this.open(); return false; } diff --git a/app/assets/stylesheets/publisher.css.scss b/app/assets/stylesheets/publisher.css.scss index f56d374db5d6130262f3e2fb262121a438e19cd1..0fe934716c7774227d67f380558688f9ba28ab7d 100644 --- a/app/assets/stylesheets/publisher.css.scss +++ b/app/assets/stylesheets/publisher.css.scss @@ -100,28 +100,28 @@ > li.publisher_photo { list-style: none; float: left; - margin: 10px; - height: 100px; - width: 100px; + margin: 8px; + height: 80px; + width: 80px; overflow: hidden; - line-height: 100px; + line-height: 80px; vertical-align: middle; img { vertical-align: middle; - width: 100px; + width: 80px; } .x { display: none; - width: 70px; - height: 70px; - border-radius: 35px; + width: 50px; + height: 50px; + border-radius: 25px; text-align: center; background-color: white; color: black; - font-size: 70px; - line-height: 70px; + font-size: 50px; + line-height: 50px; font-style: bold; position: absolute; z-index: 2; @@ -143,7 +143,7 @@ .progress { width: 100%; height: 20px; - margin: 40px 0; + margin: 30px 0; } .ajax-loader { display: none; } diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml index 4fe8787323521cea2b02e53f2bc26a193fc6244f..56f0dc555d19a8b144558d30a5442492761bf06d 100644 --- a/app/views/shared/_publisher.html.haml +++ b/app/views/shared/_publisher.html.haml @@ -100,7 +100,8 @@ %button{ :disabled => ("disabled" if publisher_hidden_text.blank?), :class => 'btn btn-default post_preview_button'} = t('.preview') - = status.submit t('.share'), :disabled => publisher_hidden_text.blank?, :class => 'btn btn-primary creation', :tabindex => 2 + %button#submit.btn.btn-primary.creation{ :disabled => ("disabled" if publisher_hidden_text.blank?), :tabindex => 2} + = t('.share') .facebox_content #question_mark_pane diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index 1abb4eb9383393817a4b1778078c1e3ed3e2863c..8c52e44c1500894a7a034363ea03112061c8850d 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -35,6 +35,6 @@ $(function(){ $("#publisher #status_message_fake_text").val(contents); $("#publisher #status_message_text").val(contents); - $('input.button')[0].removeAttribute('disabled'); + $('#publisher button#submit').removeAttr('disabled'); $('#publisher #publisher_textarea_wrapper').addClass('active'); });