From 3843ffa9fca662e853b10f09d95d3f9b589ff36c Mon Sep 17 00:00:00 2001 From: yafeilee Date: Tue, 1 Apr 2014 09:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + .../javascripts/angularjs/qrcodes.js.coffee | 3 +++ app/assets/stylesheets/blogs.css.scss | 9 +++++++++ app/assets/stylesheets/qrcodes.css.scss | 20 +++++++++++++++++++ app/views/blogs/_post.html.slim | 9 +++++++++ app/views/blogs/_qrcode.html.slim | 3 +++ 6 files changed, 45 insertions(+) create mode 100644 app/assets/javascripts/angularjs/qrcodes.js.coffee create mode 100644 app/assets/stylesheets/qrcodes.css.scss create mode 100644 app/views/blogs/_qrcode.html.slim diff --git a/Gemfile b/Gemfile index 213b897..4506faf 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,7 @@ gem 'html_truncator' gem 'nokogiri' gem 'angularjs-rails' gem 'figaro' +gem 'rqrcode-with-patches', require: 'rqrcode' group :development do gem 'quiet_assets' diff --git a/app/assets/javascripts/angularjs/qrcodes.js.coffee b/app/assets/javascripts/angularjs/qrcodes.js.coffee new file mode 100644 index 0000000..a2acf7e --- /dev/null +++ b/app/assets/javascripts/angularjs/qrcodes.js.coffee @@ -0,0 +1,3 @@ +@app.controller 'QRCodesController', ($scope)-> + $scope.show = -> + $scope.qrcode = true diff --git a/app/assets/stylesheets/blogs.css.scss b/app/assets/stylesheets/blogs.css.scss index 7787216..e579994 100644 --- a/app/assets/stylesheets/blogs.css.scss +++ b/app/assets/stylesheets/blogs.css.scss @@ -51,3 +51,12 @@ border-bottom: 1px solid #dddddd; } } + +.qrcode { + display: inline-block; + float: right; + margin-top: -5.5rem; + i { + margin-right: 0.5rem; + } +} diff --git a/app/assets/stylesheets/qrcodes.css.scss b/app/assets/stylesheets/qrcodes.css.scss new file mode 100644 index 0000000..7089536 --- /dev/null +++ b/app/assets/stylesheets/qrcodes.css.scss @@ -0,0 +1,20 @@ +.qrcode-image { + table { + border-width: 0; + border-style: none; + border-color: #0000ff; + border-collapse: collapse; + } + td { + border-width: 0; + border-style: none; + border-color: #0000ff; + border-collapse: collapse; + padding: 0; + margin: 0; + width: 10px; + height: 10px; + } + td.black { background-color: #000; } + td.white { background-color: #fff; } +} diff --git a/app/views/blogs/_post.html.slim b/app/views/blogs/_post.html.slim index b68193d..e333012 100644 --- a/app/views/blogs/_post.html.slim +++ b/app/views/blogs/_post.html.slim @@ -19,3 +19,12 @@ p ng-controller="LikesController" button.like-button ng-show=" is_liked " ng-click="cancel()" |{{ count }} span Liked + div ng-controller = "QRCodesController" + .qrcode + i.fi-link + a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()" 二维码 + .social-share ng-show='qrcode' + = debug blog_url(post) + = render partial: "qrcode", locals: { str: blog_url(post) } + + diff --git a/app/views/blogs/_qrcode.html.slim b/app/views/blogs/_qrcode.html.slim new file mode 100644 index 0000000..94484e5 --- /dev/null +++ b/app/views/blogs/_qrcode.html.slim @@ -0,0 +1,3 @@ +.qrcode-image + - qr = RQRCode::QRCode.new(str) + == qr.as_html