FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manual merge??

This commit is contained in:
ix 2015-01-06 18:59:52 +01:00
parent 221025fef7 1b4eb15152
commit f76603a071
7 changed files with 85 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -86,3 +86,8 @@ Add/remove moderators:
$ bundle exec rake 'justask:mod[someone_else]' RAILS_ENV=production
$ bundle exec rake 'justask:demod[someone_else]' RAILS_ENV=production
Add/remove supporters:
$ bundle exec rake 'justask:sup[someone_else]' RAILS_ENV=production
$ bundle exec rake 'justask:desup[someone_else]' RAILS_ENV=production

4
app/assets/stylesheets/base.css.scss
View File

@ -71,6 +71,10 @@ body {
text-transform: uppercase;
}
.j2-label {
display: inline-block;
}
.sweet-overlay {
z-index: 1031;
}

27
app/assets/stylesheets/scss/user.scss
View File

@ -94,3 +94,30 @@
height: auto;
border: medium none;
}
.profile--panel-badge {
width: 100%;
text-align: center;
padding-top: 0.05em;
padding-bottom: 0.05em;
text-transform: uppercase;
font-weight: bold;
margin: 0;
color: #fff;
}
.panel-badge-danger {
background-color: #E51C23;
}
.panel-badge-default {
background-color: #BBB;
}
.panel-badge-success {
background-color: #4CAF50;
}
.panel-badge-warning {
background-color: #FF9800;
}

2
app/models/user.rb
View File

@ -127,7 +127,7 @@ class User < ActiveRecord::Base
end
def display_website
website.match(/https?:\/\/([A-Za-z.\-]+)\/?(?:.*)/i)[1]
website.match(/https?:\/\/([A-Za-z.\-0-9]+)\/?(?:.*)/i)[1]
rescue NoMethodError
website
end

2
app/views/shared/_smiles.html.haml
View File

@ -6,5 +6,5 @@
No one smiled this, yet.
- else
- a.smiles.all.each do |smile|
%a{href: show_user_profile_path(smile.user.screen_name), data: {smile_id: smile.id}}
%a{href: show_user_profile_path(smile.user.screen_name), title: smile.user.screen_name, data: { toggle: :tooltip, placement: :top, smile_id: smile.id }}
%img.img-rounded.answerbox--img-small{src: gravatar_url(smile.user)}

40
app/views/static/about.html.haml
View File

@ -32,13 +32,33 @@
.media-body
%h4.entry-text.entry-about pixeldesu
%h6.entry-subtext Frontend Design & Layout
.media
.pull-left
%a{href: show_user_profile_path('kyr')}
%img.img-rounded.answerbox--img{src: User.find_by_screen_name('kyr').profile_picture.url(:medium)}
.media-body
%h4.entry-text.entry-about kyr
%h6.entry-subtext Node.js & Javascript
.panel.panel-default
.panel-body
%h3 Moderators
The people on
= APP_CONFIG['site_name']
that look after you!
%ul.about--moderator
- User.where(moderator: true).each do |mod|
%li
%a{href: show_user_profile_path(mod.screen_name)}
%img.answerbox--img-small{src: User.find_by_screen_name(mod.screen_name).profile_picture.url(:medium)}
= mod.screen_name
.col-sm-4
.panel.panel-default
.panel-body
%h3 Alpha version
%p This is an alpha version, full of bugs. Caveat emptor.
%p
Found a bug? Have an idea for a must-have feature? Please
= link_to "report them!", 'https://github.com/retrospring/bugs/issues'
.panel.panel-default
.panel-body
There are lies, damned lies, and then there are...
@ -61,14 +81,6 @@
.col-xs-6
%h4.entry-text#follower-count= User.count
%h6.entry-subtext Users
.col-sm-4
.panel.panel-default
.panel-body
%h3 Alpha version
%p This is an alpha version, full of bugs. Caveat emptor.
%p
Found a bug? Have an idea for a must-have feature? Please
= link_to "report them!", 'https://github.com/retrospring/bugs/issues'
.col-sm-4
.panel.panel-default
.panel-body
@ -82,5 +94,17 @@
%input{:alt => "PayPal - The safer, easier way to pay online!", :border => "0", :name => "submit", :src => "https://www.paypalobjects.com/en_US/AT/i/btn/btn_donateCC_LG.gif", :type => "image"}/
%img{:alt => "", :border => "0", :height => "1", :src => "https://www.paypalobjects.com/de_DE/i/scr/pixel.gif", :width => "1"}/
Want to support us over a longer timespan? We also have a Patreon campaign!
%a.btn.btn-primary.btn-block{href: "https://patreon.com/retrospring"} Patreon
.panel.panel-default
.panel-body
%h3 Patrons
People that believe in our vision, and that's why we love them <3
%ul.about--moderator
- User.where(supporter: true).each do |sup|
%li
%a{href: show_user_profile_path(sup.screen_name)}
%img.answerbox--img-small{src: User.find_by_screen_name(sup.screen_name).profile_picture.url(:medium)}
= sup.screen_name
= render "shared/links"

43
app/views/user/_profile_info.html.haml
View File

@ -1,42 +1,29 @@
.panel.panel-default
%img.profile--avatar{src: @user.profile_picture.url(:large)}
- if @user.admin?
.profile--panel-badge.panel-badge-danger
%i.fa.fa-flask
Admin
- if @user.moderator?
.profile--panel-badge.panel-badge-success
%i.fa.fa-users
Mod
- if @user.supporter?
.profile--panel-badge.panel-badge-warning
%i.fa.fa-star
Supporter
- if @user.following? current_user
.profile--panel-badge.panel-badge-default
Follows you
.panel-body
- if @user.display_name.blank?
.profile--displayname
= @user.screen_name
- if @user.admin?
%span.label.label-danger.j2-up
%i.fa.fa-flask
Admin
- if @user.moderator?
%span.label.label-success.j2-up
%i.fa.fa-users
Mod
- if @user.supporter?
%span.label.label-warning.j2-up
%i.fa.fa-star
Supporter
- else
.profile--displayname
= @user.display_name
- if @user.admin?
%span.label.label-danger.j2-up
%i.fa.fa-flask
Admin
- if @user.moderator?
%span.label.label-success.j2-up
%i.fa.fa-users
Mod
- if @user.supporter?
%span.label.label-warning.j2-up
%i.fa.fa-star
Supporter
.profile--username
= @user.screen_name
- if @user.following? current_user
%p.profile--followtag
%span.label.label-default.j2-up
Follows you
- unless @user.bio.blank?
%p.profile--text= @user.bio
- unless @user.website.blank?