Permalink
Browse files

Merge branch 'master' of github.com:newscloud/n2

  • Loading branch information...
2 parents b3fe942 + 46c6ab3 commit 6f17566e0cfd63014dd3a048435b4ef13d96fb06 @chewbranca chewbranca committed Jan 12, 2012
@@ -711,6 +711,12 @@ p
.content
+grid(3)
+omega()
+ // top users list
+ .item-users
+ padding-left: 50px
+ .profile-pic
+ float: left
+ margin-left: -50px
// users online widget
.users-online
@@ -917,8 +923,8 @@ p
color: $tertiary-header-color
> a
font-size: $primary-body-size
-// My Profile Page
+// My Profile Page
.bio-box
background-color: $tertiary-bg-color
position: relative
@@ -1532,5 +1538,79 @@ body div.jGrowl div.jGrowl-closer
float: left
+.test-shadow
+ background: rgba(0,0,0, .5)
+ +grid(12)
+ padding: 50px 0
+
+.simple-post-wrap
+ background-color: $tertiary-bg-color
+ border: 1px solid scale-color($tertiary-bg-color, $lightness: -60%)
+ +grid(8)
+ display: block
+ float: none
+ margin: 0 auto
+ padding: 10px 10px 0 10px
+ position: relative
+ min-height: 140px
+ .close-btn
+ background: image_url("site/btn-close.gif") top left no-repeat
+ position: absolute
+ height: 15px
+ width: 15px
+ top: $ninesixty_gutter_width / 2
+ right: $ninesixty_gutter_width / 2
+
+// Simple Posting Widget
+.simple-post
+ .media-link
+ display: inline-block
+ padding: 5px 10px
+ .active
+ background: scale-color($tertiary-bg-color, $lightness: -60%)
+ color: #fff
+ .panel-bar
+ width: auto
+ form.formtastic
+ padding: $ninesixty_gutter_width / 2 0 0 0
+ fieldset
+ margin-bottom: $ninesixty_gutter_width / 2
+ .post-input-wrap
+ +grid(5)
+ +omega()
+ .img-rotator-wrap
+ +grid(3)
+ +alpha()
+ .img-viewport-wrap, .no-img-input
+ +grid(3)
+ +alpha()
+ +omega()
+ .img-viewport-wrap
+ padding-top: 10px
+ position: relative
+ .img-viewport
+ min-height: 100px
+ background: #fff
+ margin-bottom: 30px
+ .img-rotate-btn
+ height: 20px
+ width: 20px
+ display: block
+ position: absolute
+ text-align: center
+ bottom: 0px
+ &.prev
+ background: image_url("site/ir-arrows.png") top left no-repeat
+ left: 10px
+ &:hover
+ background-position: bottom left
+ &.next
+ background: image_url("site/ir-arrows.png") top right no-repeat
+ right: 10px
+ &:hover
+ background-position: bottom right
+ .no-img-input
+ padding: 10px 0
+ text-align: center
@@ -5,3 +5,6 @@
= render :partial => 'shared/tests/list_2_col'
#right-col
= render :partial => 'shared/tests/featured_1_col'
+
+.test-shadow
+ = render :partial => 'shared/tests/simple_posting'
@@ -16,14 +16,12 @@
- elsif item_type == 'prediction'
- display_score = accuracy << "%"
%li
- .item-block
+ .item-users
.profile-pic= local_linked_profile_pic user
- .float-left
- %h4== #{local_linked_profile_name(user)}
- -#TODO:: add something in here
- -#%h3= "City and State"
- .float-right
- %h4.userPoints= score.total_score
+ %h4.float-left== #{local_linked_profile_name(user)}
+ -#TODO:: add something in here
+ -#%h3= "City and State"
+ %h4.float-right= score.total_score
- else
.subtitle
%span= list_empty
@@ -99,5 +99,16 @@
.actions-wrap
%a.button-link Post Content
+// top users widget
+.panel-1
+ .panel-bar
+ %h2 Top Users
-
+ .item-list-wrap
+ .item-list
+ %ul
+ %li
+ .item-users
+ .profile-pic= image_tag('skin/generic-profile-pic.jpg')
+ %h4.float-left User Name
+ %h4.float-right 1,230
@@ -0,0 +1,242 @@
+.simple-post-wrap.clearfix
+ .close-btn
+ .simple-post
+ .panel-bar
+ %h2 Simple Posting Widget
+ %form.formtastic
+ %fieldset.form-desc
+ %p Hi, Before you begin posting, please sign in or register
+ // this part below is more for show than anything else. I assume you'll use the same code you do for all login requests.
+ %fieldset.provider-links
+ %a.auth_provider{:href => "#"}
+ %img{ :height => '64px', :width =>'64px', :alt => 'facebook'}
+ %a.auth_provider{:href => "#"}
+ %img{ :height => '64px', :width =>'64px', :alt => 'twitter'}
+
+// NOT PART OF SIMPLE POSTING WIDGET
+%br
+%br
+%br
+%br
+%br
+%br
+// NOT PART OF SIMPLE POSTING WIDGET
+
+.simple-post-wrap.clearfix
+ .close-btn
+ .simple-post
+ .panel-bar
+ %h2 Simple Posting Widget
+ %form.formtastic
+ %fieldset.form-desc
+ %p Share a Story
+ %fieldset.inputs
+ %ol
+ %li.file
+ %input{:type => 'file'}
+
+// NOT PART OF SIMPLE POSTING WIDGET
+%br
+%br
+%br
+%br
+%br
+%br
+// NOT PART OF SIMPLE POSTING WIDGET
+
+.simple-post-wrap.clearfix
+ .close-btn
+ .simple-post
+ .panel-bar
+ %h2 Simple Posting Widget
+ %form.formtastic
+ %fieldset.inputs
+ .img-rotator-wrap
+ .img-viewport-wrap
+ .img-viewport
+ %a{ :class => 'img-rotate-btn prev'}
+ %a{ :class => 'img-rotate-btn next'}
+ .no-img-input
+ %label
+ %input{ :type => 'checkbox'}
+ No Image
+ .post-input-wrap
+ %ol
+ %li
+ %label Title
+ %input{:type => 'text'}
+ %li
+ %label URL
+ %input{:type => 'text'}
+ %li
+ %label Caption
+ %textarea
+ %fieldset.media
+ %ol
+ %li
+ %p
+ %a.media-link Add Video
+ %li
+ %p
+ %a.media-link Add Audio
+ %fieldset.buttons
+ %ol
+ %li{:class => 'commit float-right'}
+ %input{:type => 'submit', :class => 'button-input next create', :value => 'Post!'}
+
+// NOT PART OF SIMPLE POSTING WIDGET
+%br
+%br
+%br
+%br
+%br
+%br
+// NOT PART OF SIMPLE POSTING WIDGET
+
+.simple-post-wrap.clearfix
+ .close-btn
+ .simple-post
+ .panel-bar
+ %h2 Simple Posting Widget
+ %form.formtastic
+ %fieldset.inputs
+ .img-rotator-wrap
+ .img-viewport-wrap
+ .img-viewport
+ %a{ :class => 'img-rotate-btn prev'}
+ %a{ :class => 'img-rotate-btn next'}
+ .no-img-input
+ %label
+ %input{ :type => 'checkbox'}
+ No Image
+ .post-input-wrap
+ %ol
+ %li
+ %label Title
+ %input{:type => 'text'}
+ %li
+ %label URL
+ %input{:type => 'text'}
+ %li
+ %label Caption
+ %textarea
+ %fieldset.media.inputs
+ %ol
+ %li
+ %p
+ %a.media-link.active Add Video
+ %label Add a video to dipslay along with your story from YouTube or Vimeo
+ %input{:type => 'text'}
+ %li
+ %p
+ %a.media-link Add Audio
+ %fieldset.buttons
+ %ol
+ %li{:class => 'commit float-right'}
+ %input{:type => 'submit', :class => 'button-input next create', :value => 'Post!'}
+
+// NOT PART OF SIMPLE POSTING WIDGET
+%br
+%br
+%br
+%br
+%br
+%br
+// NOT PART OF SIMPLE POSTING WIDGET
+
+.simple-post-wrap.clearfix
+ .close-btn
+ .simple-post
+ .panel-bar
+ %h2 Simple Posting Widget
+ %form.formtastic
+ %fieldset.inputs
+ .img-rotator-wrap
+ .img-viewport-wrap
+ .img-viewport
+ %a{ :class => 'img-rotate-btn prev'}
+ %a{ :class => 'img-rotate-btn next'}
+ .no-img-input
+ %label
+ %input{ :type => 'checkbox'}
+ No Image
+ .post-input-wrap
+ %ol
+ %li
+ %label Title
+ %input{:type => 'text'}
+ %li
+ %label URL
+ %input{:type => 'text'}
+ %li
+ %label Caption
+ %textarea
+ %fieldset.media.inputs
+ %ol
+ %li
+ %p
+ %a.media-link Add Video
+ %li
+ %p
+ %a.media-link.active Add Audio
+ %label Add an audio file to your article cause it's what all the cool kids are doing.
+ %input{:type => 'text'}
+ %fieldset.buttons
+ %ol
+ %li{:class => 'commit float-right'}
+ %input{:type => 'submit', :class => 'button-input next create', :value => 'Post!'}
+
+// NOT PART OF SIMPLE POSTING WIDGET
+%br
+%br
+%br
+%br
+%br
+%br
+// NOT PART OF SIMPLE POSTING WIDGET
+
+.simple-post-wrap.clearfix
+ .close-btn
+ .simple-post
+ .panel-bar
+ %h2 Simple Posting Widget
+ %form.formtastic
+ %fieldset.inputs
+ .img-rotator-wrap
+ .img-viewport-wrap
+ .img-viewport
+ %a{ :class => 'img-rotate-btn prev'}
+ %a{ :class => 'img-rotate-btn next'}
+ .no-img-input
+ %label
+ %input{ :type => 'checkbox'}
+ No Image
+ .post-input-wrap
+ %ol
+ %li
+ %label Title
+ %input{:type => 'text'}
+ %li
+ %label URL
+ %input{:type => 'text'}
+ %li
+ %label Caption
+ %textarea
+ %fieldset.media.inputs
+ %ol
+ %li
+ %p
+ %a.media-link.active Add Video
+ %label Add a video to dipslay along with your story from YouTube or Vimeo
+ %input{:type => 'text'}
+ %li
+ %p
+ %a.media-link.active Add Audio
+ %label Add an audio file to your article cause it's what all the cool kids are doing.
+ %input{:type => 'text'}
+ %fieldset.buttons
+ %ol
+ %li{:class => 'commit float-right'}
+ %input{:type => 'submit', :class => 'button-input next create', :value => 'Post!'}
+
+
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6f17566

Please sign in to comment.