VRFS-294 Adjustments to HTML/ CSS.
This commit is contained in:
Daniel Weigh
parent
0ecbf9f047
commit
9c6ccee6f0
|
|
@ -111,7 +111,7 @@
|
|||
}
|
||||
var actionVals = {
|
||||
profile_url: "/#/profile/" + mm.id,
|
||||
button_friend: mm['is_friend'] ? '' : 'button-orance',
|
||||
button_friend: mm['is_friend'] ? '' : 'button-orange',
|
||||
button_follow: mm['is_following'] ? '' : 'button-orange',
|
||||
button_message: 'button-orange'
|
||||
};
|
||||
|
|
@ -233,4 +233,4 @@
|
|||
return this;
|
||||
};
|
||||
|
||||
})(window,jQuery);
|
||||
})(window,jQuery);
|
||||
|
|
|
|||
|
|
@ -34,5 +34,8 @@ $text: #f3f1ee;
|
|||
$gradient-diff: 30%; $link: $color8;
|
||||
$border: hsl(210, 50%, 45%);
|
||||
|
||||
$narrow-screen: 1000px; // 990 ? 1000 ?
|
||||
$short-screen: 600px; // toolbars / chrome for x768
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,382 @@
|
|||
/* This is simply Jeff's content.css file */
|
||||
@charset "UTF-8";
|
||||
#content {
|
||||
background-color: #353535;
|
||||
border: 1px solid #ed3618;
|
||||
clear: both;
|
||||
float: left;
|
||||
margin-top: 39px;
|
||||
height: auto;
|
||||
width: auto;
|
||||
position:relative;
|
||||
padding-bottom:3px;
|
||||
}
|
||||
|
||||
.content-head {
|
||||
height:21px;
|
||||
padding:4px;
|
||||
background-color:#ED3618;
|
||||
}
|
||||
|
||||
.content-icon {
|
||||
margin-right:10px;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.content-head h1 {
|
||||
margin: -6px 0px 0px 0px;
|
||||
padding:0;
|
||||
float:left;
|
||||
font-weight:100;
|
||||
font-size:24px;
|
||||
}
|
||||
|
||||
.content-nav {
|
||||
float:right;
|
||||
margin-right:10px;
|
||||
}
|
||||
|
||||
.home-icon {
|
||||
float:left;
|
||||
margin-right:20px;
|
||||
}
|
||||
|
||||
.content-nav a.arrow-right {
|
||||
float:left;
|
||||
display:block;
|
||||
margin-top:2px;
|
||||
margin-right:10px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 7px solid transparent;
|
||||
border-bottom: 7px solid transparent;
|
||||
border-left: 7px solid #FFF;
|
||||
}
|
||||
|
||||
.content-nav a.arrow-left {
|
||||
float:left;
|
||||
display:block;
|
||||
margin-top:2px;
|
||||
margin-right:20px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 7px solid transparent;
|
||||
border-bottom: 7px solid transparent;
|
||||
border-right:7px solid #FFF;
|
||||
}
|
||||
|
||||
#content-scroller, .content-scroller {
|
||||
height:inherit;
|
||||
position:relative;
|
||||
display:block;
|
||||
overflow:auto;
|
||||
}
|
||||
|
||||
.content-wrapper {
|
||||
padding:10px 30px 10px 36px;
|
||||
font-size:15px;
|
||||
color:#ccc;
|
||||
border-bottom: dotted 1px #444;
|
||||
overflow-x:hidden;
|
||||
white-space:nowrap;
|
||||
}
|
||||
|
||||
.create-session-left {
|
||||
width:50%;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.create-session-right {
|
||||
width:45%;
|
||||
float:right;
|
||||
font-size:13px;
|
||||
}
|
||||
|
||||
.content-wrapper h2 {
|
||||
color:#fff;
|
||||
font-weight:600;
|
||||
font-size:24px;
|
||||
}
|
||||
|
||||
.content-wrapper select, .content-wrapper textarea, .content-wrapper input[type=text], .content-wrapper input[type=password], div.friendbox, .ftue-inner input[type=text], .ftue-inner input[type=password], .dialog-inner textarea, .dialog-inner input[type=text] {
|
||||
font-family:"Raleway", arial, sans-serif;
|
||||
background-color:#c5c5c5;
|
||||
border:none;
|
||||
-webkit-box-shadow: inset 2px 2px 3px 0px #888;
|
||||
box-shadow: inset 2px 2px 3px 0px #888;
|
||||
color:#666;
|
||||
}
|
||||
|
||||
.create-session-description {
|
||||
padding:5px;
|
||||
width:100%;
|
||||
height:80px;
|
||||
}
|
||||
|
||||
.friendbox {
|
||||
padding:5px;
|
||||
width:100%;
|
||||
height:60px;
|
||||
}
|
||||
|
||||
.invite-friend {
|
||||
margin:0px 4px 4px 4px;
|
||||
float:left;
|
||||
display:block;
|
||||
background-color:#666;
|
||||
color:#fff;
|
||||
font-size:12px;
|
||||
-webkit-border-radius: 7px;
|
||||
border-radius: 7px;
|
||||
padding:2px 2px 2px 4px;
|
||||
}
|
||||
|
||||
.content-wrapper div.friendbox input[type=text] {
|
||||
-webkit-box-shadow: inset 0px 0px 0px 0px #888;
|
||||
box-shadow: inset 0px 0px 0px 0px #888;
|
||||
color:#666;
|
||||
font-style:italic;
|
||||
}
|
||||
|
||||
#genrelist, #musicianlist {
|
||||
position:relative;
|
||||
z-index:99;
|
||||
width: 175px;
|
||||
-webkit-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
background-color:#C5C5C5;
|
||||
border: none;
|
||||
color:#333;
|
||||
font-weight:400;
|
||||
padding:0px 0px 0px 8px;
|
||||
height:20px;
|
||||
line-height:20px;
|
||||
overflow:hidden;
|
||||
-webkit-box-shadow: inset 2px 2px 3px 0px #888;
|
||||
box-shadow: inset 2px 2px 3px 0px #888;
|
||||
}
|
||||
|
||||
#musicianlist, .session-controls #genrelist {
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
#genrelist a, #musicianlist a {
|
||||
color:#333;
|
||||
text-decoration:none;
|
||||
}
|
||||
|
||||
.genre-wrapper, .musician-wrapper {
|
||||
float:left;
|
||||
width:175px;
|
||||
height:127px;
|
||||
overflow:auto;
|
||||
}
|
||||
|
||||
.musician-wrapper, .session-controls .genre-wrapper {
|
||||
width:150px;
|
||||
}
|
||||
|
||||
.genrecategory {
|
||||
font-size:11px;
|
||||
float:left;
|
||||
width:135px;
|
||||
}
|
||||
|
||||
.filtercategory, .session-controls .genrecategory {
|
||||
font-size:11px;
|
||||
float:left;
|
||||
width:110px;
|
||||
}
|
||||
|
||||
a.arrow-up {
|
||||
float:right;
|
||||
margin-right:5px;
|
||||
display:block;
|
||||
margin-top:6px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 7px solid transparent;
|
||||
border-right: 7px solid transparent;
|
||||
border-bottom: 7px solid #333;
|
||||
}
|
||||
|
||||
a.arrow-down {
|
||||
float:right;
|
||||
margin-right:5px;
|
||||
display:block;
|
||||
margin-top:6px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 7px solid transparent;
|
||||
border-right: 7px solid transparent;
|
||||
border-top: 7px solid #333;
|
||||
}
|
||||
|
||||
.settings-session-description {
|
||||
padding:10px;
|
||||
width:300px;
|
||||
}
|
||||
|
||||
#session-controls {
|
||||
width:100%;
|
||||
padding:11px 0px 11px 0px;
|
||||
background-color:#4c4c4c;
|
||||
min-height:20px;
|
||||
overflow-x:hidden;
|
||||
}
|
||||
|
||||
#session-controls .searchbox {
|
||||
float:left;
|
||||
width:140px;
|
||||
margin-left: 10px;
|
||||
-webkit-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
background-color:#C5C5C5;
|
||||
border: none;
|
||||
color:#333;
|
||||
font-weight:400;
|
||||
padding:0px 0px 0px 8px;
|
||||
height:20px;
|
||||
line-height:20px;
|
||||
overflow:hidden;
|
||||
-webkit-box-shadow: inset 2px 2px 3px 0px #888;
|
||||
box-shadow: inset 2px 2px 3px 0px #888;
|
||||
}
|
||||
|
||||
#session-controls input[type=text] {
|
||||
background-color:#c5c5c5;
|
||||
border:none;
|
||||
color:#666;
|
||||
}
|
||||
|
||||
.avatar-tiny {
|
||||
float:left;
|
||||
padding:1px;
|
||||
width:24px;
|
||||
height:24px;
|
||||
background-color:#ed3618;
|
||||
-webkit-border-radius:12px;
|
||||
-moz-border-radius:12px;
|
||||
border-radius:12px;
|
||||
}
|
||||
|
||||
.ftue-background {
|
||||
background-image:url(../images/content/bkg_ftue.jpg);
|
||||
background-repeat:no-repeat;
|
||||
background-size:cover;
|
||||
min-height:475px;
|
||||
min-width:672px;
|
||||
}
|
||||
|
||||
table.generaltable {
|
||||
background-color: #262626;
|
||||
border: 1px solid #4D4D4D;
|
||||
color: #FFFFFF;
|
||||
font-size: 11px;
|
||||
margin-top: 6px;
|
||||
width: 100%;
|
||||
|
||||
th {
|
||||
background-color: #4D4D4D;
|
||||
border-right: 1px solid #333333;
|
||||
font-weight: 300;
|
||||
padding: 6px;
|
||||
}
|
||||
|
||||
td {
|
||||
border-right: 1px solid #333333;
|
||||
border-top: 1px solid #333333;
|
||||
padding: 9px 5px 5px;
|
||||
vertical-align: top;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.noborder {
|
||||
border-right: medium none;
|
||||
}
|
||||
}
|
||||
|
||||
ul.shortcuts {
|
||||
border:1px solid #ED3618;
|
||||
|
||||
li {
|
||||
margin:0;
|
||||
height:20px;
|
||||
line-height:20px;
|
||||
padding:2px;
|
||||
}
|
||||
|
||||
.account-home, .band-setup, .audio, .get-help, .download-app, .invite-friends {
|
||||
border-bottom:1px;
|
||||
border-style:solid;
|
||||
border-color:#ED3618;
|
||||
}
|
||||
|
||||
span.arrow-right {
|
||||
display:inline-block;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
border-left: 4px solid #FFCC00;
|
||||
padding-left:5px;
|
||||
}
|
||||
|
||||
ul.shortcuts-submenu {
|
||||
display:none;
|
||||
|
||||
li {
|
||||
margin:0;
|
||||
height:20px;
|
||||
line-height:20px;
|
||||
padding:2px;
|
||||
color:#FFCC00;
|
||||
}
|
||||
|
||||
li.google-invite, li.email-invite {
|
||||
padding-left:9px;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.tagline {
|
||||
font-size:30px;
|
||||
margin-top:35px;
|
||||
color:#ed3718;
|
||||
font-weight:300;
|
||||
width:345px;
|
||||
clear:left;
|
||||
white-space:normal;
|
||||
}
|
||||
|
||||
.smallbutton {
|
||||
font-size:10px !important;
|
||||
padding:2px 8px !important;
|
||||
}
|
||||
|
||||
.whitespace {
|
||||
white-space:normal;
|
||||
}
|
||||
|
||||
.w0 {width:0% !important}
|
||||
.w5 {width:5% !important}
|
||||
.w10 {width:10% !important}
|
||||
.w15 {width:15% !important}
|
||||
.w20 {width:20% !important}
|
||||
.w25 {width:25% !important}
|
||||
.w30 {width:30% !important}
|
||||
.w35 {width:35% !important}
|
||||
.w40 {width:40% !important}
|
||||
.w45 {width:45% !important}
|
||||
.w50 {width:50% !important}
|
||||
.w55 {width:55% !important}
|
||||
.w60 {width:60% !important}
|
||||
.w65 {width:65% !important}
|
||||
.w70 {width:70% !important}
|
||||
.w75 {width:75% !important}
|
||||
.w80 {width:80% !important}
|
||||
.w85 {width:85% !important}
|
||||
.w90 {width:90% !important}
|
||||
.w95 {width:95% !important}
|
||||
.w100 {width:100% !important}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
/* This is simply Jeff's content.css file */
|
||||
@charset "UTF-8";
|
||||
/* This is Daniel's content.css file */
|
||||
/* Common styles used in screens */
|
||||
@import "client/common.css.scss";@charset "UTF-8";
|
||||
|
||||
#content {
|
||||
background-color: #353535;
|
||||
border: 1px solid #ed3618;
|
||||
|
|
@ -12,58 +14,96 @@
|
|||
padding-bottom:3px;
|
||||
}
|
||||
|
||||
.content-head {
|
||||
height:21px;
|
||||
padding:4px;
|
||||
background-color:#ED3618;
|
||||
/* Daniel's tweaks */
|
||||
.screen, .screen .content {
|
||||
.content-head {
|
||||
position: absolute;
|
||||
height:21px;
|
||||
padding:4px 0;
|
||||
width:100%;
|
||||
background-color:$ColorScreenPrimary;
|
||||
|
||||
.content-icon {
|
||||
margin: -1px 10px 0 4px;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.content-nav {
|
||||
float:right;
|
||||
margin-right:10px;
|
||||
|
||||
a {
|
||||
&.arrow-right,
|
||||
&.arrow-left {
|
||||
float:left;
|
||||
display:block;
|
||||
margin-top:2px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 7px solid transparent;
|
||||
border-bottom: 7px solid transparent;
|
||||
}
|
||||
&.arrow-right {
|
||||
margin-right:10px;
|
||||
border-left: 7px solid #FFF;
|
||||
}
|
||||
&.arrow-left {
|
||||
margin-right:20px;
|
||||
border-right:7px solid #FFF;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: -3px 0px 0px 0px;
|
||||
padding:0;
|
||||
float:left;
|
||||
font-weight:100;
|
||||
font-size:24px;
|
||||
}
|
||||
}
|
||||
.content-body {
|
||||
height:100%;
|
||||
width:100%;
|
||||
box-sizing: border-box;
|
||||
padding-top: 29px;
|
||||
|
||||
.content-body-scroller {
|
||||
height:inherit;
|
||||
position:relative;
|
||||
display:block;
|
||||
overflow:auto;
|
||||
// padding: 10px 35px;
|
||||
|
||||
@media screen and (max-width: $narrow-screen) {
|
||||
// padding: 10px 20px;
|
||||
}
|
||||
|
||||
&.outer {
|
||||
overflow: hidden;
|
||||
> * {
|
||||
height:inherit;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content-icon {
|
||||
margin-right:10px;
|
||||
float:left;
|
||||
.result-list-button-wrapper {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
> a.smallbutton {
|
||||
margin: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
.content-head h1 {
|
||||
margin: -6px 0px 0px 0px;
|
||||
padding:0;
|
||||
float:left;
|
||||
font-weight:100;
|
||||
font-size:24px;
|
||||
}
|
||||
|
||||
.content-nav {
|
||||
float:right;
|
||||
margin-right:10px;
|
||||
}
|
||||
|
||||
.home-icon {
|
||||
float:left;
|
||||
margin-right:20px;
|
||||
}
|
||||
|
||||
.content-nav a.arrow-right {
|
||||
float:left;
|
||||
display:block;
|
||||
margin-top:2px;
|
||||
margin-right:10px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 7px solid transparent;
|
||||
border-bottom: 7px solid transparent;
|
||||
border-left: 7px solid #FFF;
|
||||
}
|
||||
|
||||
.content-nav a.arrow-left {
|
||||
float:left;
|
||||
display:block;
|
||||
margin-top:2px;
|
||||
margin-right:20px;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 7px solid transparent;
|
||||
border-bottom: 7px solid transparent;
|
||||
border-right:7px solid #FFF;
|
||||
}
|
||||
|
||||
#content-scroller, .content-scroller {
|
||||
height:inherit;
|
||||
|
|
@ -72,25 +112,14 @@
|
|||
overflow:auto;
|
||||
}
|
||||
|
||||
.content-wrapper {
|
||||
padding:10px 30px 10px 36px;
|
||||
font-size:15px;
|
||||
color:#ccc;
|
||||
border-bottom: dotted 1px #444;
|
||||
overflow-x:hidden;
|
||||
white-space:nowrap;
|
||||
}
|
||||
|
||||
.create-session-left {
|
||||
width:50%;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.create-session-right {
|
||||
width:45%;
|
||||
float:right;
|
||||
font-size:13px;
|
||||
}
|
||||
//.content-wrapper {
|
||||
// padding:10px 30px 10px 36px;
|
||||
// font-size:15px;
|
||||
// color:#ccc;
|
||||
// border-bottom: dotted 1px #444;
|
||||
// overflow-x:hidden;
|
||||
// white-space:nowrap;
|
||||
//}
|
||||
|
||||
.content-wrapper h2 {
|
||||
color:#fff;
|
||||
|
|
@ -222,7 +251,7 @@ a.arrow-down {
|
|||
padding:11px 0px 11px 0px;
|
||||
background-color:#4c4c4c;
|
||||
min-height:20px;
|
||||
overflow-x:hidden;
|
||||
overflow-x:scroll;
|
||||
}
|
||||
|
||||
#session-controls .searchbox {
|
||||
|
|
@ -379,4 +408,4 @@ ul.shortcuts {
|
|||
.w85 {width:85% !important}
|
||||
.w90 {width:90% !important}
|
||||
.w95 {width:95% !important}
|
||||
.w100 {width:100% !important}
|
||||
.w100 {width:100% !important}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,9 @@
|
|||
.create-session {
|
||||
.content {
|
||||
.content-head {
|
||||
position:absolute;
|
||||
z-index:1;
|
||||
padding: 4px 0;
|
||||
width:100%;
|
||||
|
||||
.content-icon {
|
||||
margin-left:4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.session-wrapper {
|
||||
padding: 29px 35px 10px;
|
||||
padding: 10px 35px;
|
||||
white-space: initial;
|
||||
|
||||
> div.session {
|
||||
width: 50%;
|
||||
padding-top: 10px;
|
||||
|
||||
&.right {
|
||||
font-size: 13px;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,35 @@
|
|||
.filter-element {
|
||||
float:left;
|
||||
margin-left: 5px;
|
||||
|
||||
&.wrapper {
|
||||
margin-top: 5px;
|
||||
&.right {
|
||||
float: right;
|
||||
> a {
|
||||
margin-top: 3px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// @FIXME labeel is overriding from #session-controls.
|
||||
&.desc {
|
||||
margin-top: 3px;
|
||||
padding-top: 3px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#musician-filter-results {
|
||||
margin: 0 10px 5px 10px;
|
||||
margin: 0 10px 0px 10px;
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
// width: 100%;
|
||||
}
|
||||
|
||||
.musician-wrapper {
|
||||
overflow: auto;
|
||||
height: 480px;
|
||||
// overflow: auto;
|
||||
// height: 480px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
|
@ -20,8 +37,12 @@
|
|||
padding-top: 5px;
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
box-sizing:border-box;
|
||||
}
|
||||
|
||||
#session-controls.musician-filter {
|
||||
padding-top: 6px;
|
||||
}
|
||||
.musician-following {
|
||||
overflow: auto;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
@import "client/common.css.scss";
|
||||
|
||||
.profile-header {
|
||||
padding:20px;
|
||||
height:120px;
|
||||
padding:10px 20px;
|
||||
// height:120px;
|
||||
}
|
||||
|
||||
.profile-header h2 {
|
||||
|
|
@ -252,4 +252,4 @@
|
|||
border-top:none;
|
||||
padding:3px;
|
||||
vertical-align:middle;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@
|
|||
|
||||
.query-distance-params {
|
||||
float: left;
|
||||
width: 80px;
|
||||
margin-left: 10px;
|
||||
// width: 80px;
|
||||
margin-left: 2px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,115 +1,117 @@
|
|||
<div class="content">
|
||||
<!-- Account Summary Dialog -->
|
||||
<div layout="screen" layout-id="account" class="screen secondary">
|
||||
<!-- header -->
|
||||
<div class="content-head">
|
||||
<div class="content-icon">
|
||||
<%= image_tag "content/icon_account.png", {:height => 18, :width => 18} %>
|
||||
<div layout="screen" layout-id="account" class="screen secondary">
|
||||
<!-- header -->
|
||||
<div class="content-head">
|
||||
<div class="content-icon">
|
||||
<%= image_tag "content/icon_account.png", {:height => 18, :width => 18} %>
|
||||
</div>
|
||||
<h1>my account</h1>
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<!-- end header -->
|
||||
|
||||
<div class="content-body">
|
||||
<!-- profile scrolling area -->
|
||||
<div id="account-content-scroller" class="content-body-scroller account-content-scroller">
|
||||
|
||||
</div>
|
||||
<!-- end content scrolling area -->
|
||||
</div>
|
||||
<h1>my account</h1>
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<!-- end header -->
|
||||
|
||||
<!-- profile scrolling area -->
|
||||
<div id="account-content-scroller" class="content-scroller account-content-scroller">
|
||||
<script type="text/template" id="template-account-main">
|
||||
<!-- content wrapper -->
|
||||
<div class="content-wrapper account">
|
||||
<br />
|
||||
|
||||
</div>
|
||||
<!-- end content scrolling area -->
|
||||
<div class="account-left">
|
||||
<h2>identity:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid identity">
|
||||
<strong>Email:</strong> {email}<br />
|
||||
<strong>Password:</strong> •••••••••••
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<a id="account-edit-identity-link" href="#" class="button-orange">UPDATE</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
|
||||
<div class="account-left">
|
||||
<h2>profile:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid profile">
|
||||
<div class="left small mr20" align="center">
|
||||
<a href="#" class="avatar_large"><img src="{photoUrl}" id="profile-avatar" /></a></div>
|
||||
<strong>Name:</strong> {name}<br />
|
||||
<strong>Location:</strong> {location}<br />
|
||||
<strong>Instruments:</strong> {instruments}
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<a id="account-edit-profile-link" href="#" class="button-orange">UPDATE</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="account-left">
|
||||
<h2>subscriptions:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid subscriptions">
|
||||
<!--<strong>Studio:</strong> Gold ($49.99/year)<br />
|
||||
<strong>NaaS:</strong> Yes ($29.99/year)-->
|
||||
<strong>N/A</strong><br />
|
||||
<strong>This feature not yet implemented</strong>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<!--<a id="account-edit-subscriptions-link" href="#" class="button-orange">UPDATE</a>-->
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
<% if current_user && current_user.musician? %>
|
||||
<div class="account-left">
|
||||
<h2>payments:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid payments">
|
||||
<!--<strong>Method:</strong> MasterCard •••• •••• •••• 1234<br />
|
||||
<a href="#">View Payment History</a> <a href="#">Cancel Subscription</a> -->
|
||||
<strong>N/A</strong></br />
|
||||
<strong>This feature not yet implemented</strong>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<!--<a id="account-edit-payments-link" href="#" class="button-orange">UPDATE</a>-->
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="account-left">
|
||||
<h2>audio:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid audio">
|
||||
<strong>Approved Profiles:</strong> <span class="audio-profiles-short">{profiles}</span>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<a id="account-edit-audio-link" href="#" class="button-orange">UPDATE</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<% end %>
|
||||
</div>
|
||||
<!-- end content wrapper -->
|
||||
</script>
|
||||
</div>
|
||||
|
||||
<script type="text/template" id="template-account-main">
|
||||
<!-- content wrapper -->
|
||||
<div class="content-wrapper account">
|
||||
<br />
|
||||
|
||||
<div class="account-left">
|
||||
<h2>identity:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid identity">
|
||||
<strong>Email:</strong> {email}<br />
|
||||
<strong>Password:</strong> •••••••••••
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<a id="account-edit-identity-link" href="#" class="button-orange">UPDATE</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
|
||||
<div class="account-left">
|
||||
<h2>profile:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid profile">
|
||||
<div class="left small mr20" align="center">
|
||||
<a href="#" class="avatar_large"><img src="{photoUrl}" id="profile-avatar" /></a></div>
|
||||
<strong>Name:</strong> {name}<br />
|
||||
<strong>Location:</strong> {location}<br />
|
||||
<strong>Instruments:</strong> {instruments}
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<a id="account-edit-profile-link" href="#" class="button-orange">UPDATE</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="account-left">
|
||||
<h2>subscriptions:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid subscriptions">
|
||||
<!--<strong>Studio:</strong> Gold ($49.99/year)<br />
|
||||
<strong>NaaS:</strong> Yes ($29.99/year)-->
|
||||
<strong>N/A</strong><br />
|
||||
<strong>This feature not yet implemented</strong>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<!--<a id="account-edit-subscriptions-link" href="#" class="button-orange">UPDATE</a>-->
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
<% if current_user && current_user.musician? %>
|
||||
|
||||
<div class="account-left">
|
||||
<h2>payments:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid payments">
|
||||
<!--<strong>Method:</strong> MasterCard •••• •••• •••• 1234<br />
|
||||
<a href="#">View Payment History</a> <a href="#">Cancel Subscription</a> -->
|
||||
<strong>N/A</strong></br />
|
||||
<strong>This feature not yet implemented</strong>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<!--<a id="account-edit-payments-link" href="#" class="button-orange">UPDATE</a>-->
|
||||
</div>
|
||||
<br clear="all" />
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="account-left">
|
||||
<h2>audio:</h2>
|
||||
</div>
|
||||
|
||||
<div class="account-mid audio">
|
||||
<strong>Approved Profiles:</strong> <span class="audio-profiles-short">{profiles}</span>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<a id="account-edit-audio-link" href="#" class="button-orange">UPDATE</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<% end %>
|
||||
|
||||
</div>
|
||||
<!-- end content wrapper -->
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,10 @@
|
|||
<!-- end header -->
|
||||
|
||||
<!-- profile scrolling area -->
|
||||
<div id="account-audio-content-scroller" class="content-scroller account-content-scroller">
|
||||
<div class="content-body">
|
||||
<div id="account-audio-content-scroller" class="content-body-scroller account-content-scroller">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- end content scrolling area -->
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,10 @@
|
|||
<!-- end header -->
|
||||
|
||||
<!-- profile scrolling area -->
|
||||
<div id="account-identity-content-scroller" class="content-scroller account-content-scroller">
|
||||
<div class="content-body">
|
||||
<div id="account-identity-content-scroller" class="content-body-scroller">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- end content scrolling area -->
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,10 @@
|
|||
<!-- end header -->
|
||||
|
||||
<!-- profile scrolling area -->
|
||||
<div id="account-profile-content-scroller" class="content-scroller account-content-scroller">
|
||||
<div class="content-body">
|
||||
<div id="account-profile-content-scroller" class="content-body-scroller account-content-scroller">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- end content scrolling area -->
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,126 +9,127 @@
|
|||
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<form id="band-setup-form">
|
||||
<div style="display:block;">
|
||||
<input id="hdn-band-id" class="hdn-band-id" type="hidden" value="" />
|
||||
<div class="content-scroller" style="height:350px;">
|
||||
<div id="band-setup-step-1" class="content-wrapper" style="padding:10px 35px 10px 35px;">
|
||||
<br />
|
||||
<table width="105%" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td valign="top" colspan="2">
|
||||
<h2>Step 1: General Information</h2>
|
||||
</td>
|
||||
<td valign="middle" rowspan="2" width="33%">
|
||||
<a href="#" class="avatar-profile">
|
||||
<%= image_tag "shared/avatar_generic_band.png", {:id => "band-avatar", :align=>"absmiddle", :height => 88, :width => 88 } %>
|
||||
<div class="content-body">
|
||||
<div class="content-body-scroller">
|
||||
<form id="band-setup-form">
|
||||
<div style="display:block;">
|
||||
<input id="hdn-band-id" class="hdn-band-id" type="hidden" value="" />
|
||||
<div id="band-setup-step-1" class="content-wrapper" style="padding:10px 35px 10px 35px;">
|
||||
<br />
|
||||
<table width="100%" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td valign="top" colspan="2">
|
||||
<h2>Step 1: General Information</h2>
|
||||
</td>
|
||||
<td valign="middle" rowspan="2" width="33%">
|
||||
<a href="#" class="avatar-profile">
|
||||
<%= image_tag "shared/avatar_generic_band.png", {:id => "band-avatar", :align=>"absmiddle", :height => 88, :width => 88 } %>
|
||||
</a>
|
||||
<br/><br/>
|
||||
<a id="band-change-photo" href="#" class="small ml20">Upload Band Photo</a><br clear="all"><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="tdBandName" valign="middle" width="33%">Band Name:<br />
|
||||
<input id="band-name" type="text" maxlength="1024" value="" class="w80"><br />
|
||||
</td>
|
||||
<td valign="middle" width="33%">Web Site:<br />
|
||||
<input id="band-website" type="text" maxlength="4000" value="" class="w80">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="tdBandCountry" valign="middle">Country:<br />
|
||||
<select id="band-country" class="w80">
|
||||
</select><br /><br />
|
||||
</td>
|
||||
<td id="tdBandRegion" valign="middle">State/Region:<br />
|
||||
<select id="band-region" class="w80">
|
||||
</select><br /><br />
|
||||
</td>
|
||||
<td id="tdBandCity" valign="middle">City:<br />
|
||||
<select id="band-city" class="w80">
|
||||
</select><br /><br />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="tdBandGenres" valign="top">Genres:<br />
|
||||
<div class="band-setup-genres w90">
|
||||
<table id="band-genres" width="100%" cellpadding="10" cellspacing="6"></table>
|
||||
</div>
|
||||
</td>
|
||||
<td id="tdBandBiography" valign="top" colspan="2">Description / Bio:<br />
|
||||
<textarea id="band-biography" class="band-setup-bio w90" maxlength="4000"></textarea>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br clear="all" />
|
||||
<div class="right">
|
||||
<a id="btn-band-setup-cancel" class="button-grey">CANCEL</a>
|
||||
<a id="btn-band-setup-next" class="button-orange">NEXT</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="band-setup-step-2" class="content-wrapper" style="padding:10px 35px 10px 35px; display:none;">
|
||||
<br/>
|
||||
<h2>Step 2: Add Band Members</h2><br/>
|
||||
<div class="left w70">If your bandmates are already on JamKazam, start typing their names in the box<br/> below, or click the Choose Friends button to select them.</div>
|
||||
<div class="right" layout-link="select-friends">
|
||||
<a href="#" id="btn-band-choose-friends" class="button-grey right">CHOOSE FRIENDS</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<br />
|
||||
|
||||
<div class="friendbox">
|
||||
<div id="selected-band-invitees"></div>
|
||||
<input id="band-invitee-input" type="text" placeholder="Type a friend's name" width="150px" />
|
||||
</div>
|
||||
<br/><br/>
|
||||
If your bandmates are not on JamKazam yet, use any of the options below to invite them to join the service.<br/><br/>
|
||||
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a class="btn-email-invitation">
|
||||
<%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
<br/><br/>
|
||||
<a id="band-change-photo" href="#" class="small ml20">Upload Band Photo</a><br clear="all"><br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="tdBandName" valign="middle" width="33%">Band Name:<br />
|
||||
<input id="band-name" type="text" maxlength="1024" value="" class="w80"><br />
|
||||
</td>
|
||||
<td valign="middle" width="33%">Web Site:<br />
|
||||
<input id="band-website" type="text" maxlength="4000" value="" class="w80">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="tdBandCountry" valign="middle">Country:<br />
|
||||
<select id="band-country" class="w80">
|
||||
</select><br /><br />
|
||||
</td>
|
||||
<td id="tdBandRegion" valign="middle">State/Region:<br />
|
||||
<select id="band-region" class="w80">
|
||||
</select><br /><br />
|
||||
</td>
|
||||
<td id="tdBandCity" valign="middle">City:<br />
|
||||
<select id="band-city" class="w80">
|
||||
</select><br /><br />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="tdBandGenres" valign="top">Genres:<br />
|
||||
<div class="band-setup-genres w90">
|
||||
<table id="band-genres" width="100%" cellpadding="10" cellspacing="6"></table>
|
||||
</div>
|
||||
</td>
|
||||
<td id="tdBandBiography" valign="top" colspan="2">Description / Bio:<br />
|
||||
<textarea id="band-biography" class="band-setup-bio w90" maxlength="4000"></textarea>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br clear="all" />
|
||||
<div class="right">
|
||||
<a id="btn-band-setup-cancel" class="button-grey">CANCEL</a>
|
||||
<a id="btn-band-setup-next" class="button-orange">NEXT</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">E-mail</div>
|
||||
</div>
|
||||
<!--
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a id="btn-facebook-invitation">
|
||||
<%= image_tag("content/icon_facebook.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Facebook</div>
|
||||
</div>
|
||||
-->
|
||||
<!-- <div class="left mr20">
|
||||
<div class="left">
|
||||
<a href="/#/createSession" title="This feature is not yet available.">
|
||||
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Twitter</div>
|
||||
</div> -->
|
||||
<div class="left left">
|
||||
<div class="left">
|
||||
<a class="btn-gmail-invitation">
|
||||
<%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Google+</div>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<div class="right">
|
||||
<a id="btn-band-setup-back" class="button-grey">BACK</a>
|
||||
<a id="btn-band-setup-save" class="button-orange">CREATE BAND</a>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="band-setup-step-2" class="content-wrapper" style="padding:10px 35px 10px 35px; display:none;">
|
||||
<br/>
|
||||
<h2>Step 2: Add Band Members</h2><br/>
|
||||
<div class="left w70">If your bandmates are already on JamKazam, start typing their names in the box<br/> below, or click the Choose Friends button to select them.</div>
|
||||
<div class="right" layout-link="select-friends">
|
||||
<a href="#" id="btn-band-choose-friends" class="button-grey right">CHOOSE FRIENDS</a>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<br />
|
||||
|
||||
<div class="friendbox">
|
||||
<div id="selected-band-invitees"></div>
|
||||
<input id="band-invitee-input" type="text" placeholder="Type a friend's name" width="150px" />
|
||||
</div>
|
||||
<br/><br/>
|
||||
If your bandmates are not on JamKazam yet, use any of the options below to invite them to join the service.<br/><br/>
|
||||
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a class="btn-email-invitation">
|
||||
<%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">E-mail</div>
|
||||
</div>
|
||||
<!--
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a id="btn-facebook-invitation">
|
||||
<%= image_tag("content/icon_facebook.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Facebook</div>
|
||||
</div>
|
||||
-->
|
||||
<!-- <div class="left mr20">
|
||||
<div class="left">
|
||||
<a href="/#/createSession" title="This feature is not yet available.">
|
||||
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Twitter</div>
|
||||
</div> -->
|
||||
<div class="left left">
|
||||
<div class="left">
|
||||
<a class="btn-gmail-invitation">
|
||||
<%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Google+</div>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<div class="right">
|
||||
<a id="btn-band-setup-back" class="button-grey">BACK</a>
|
||||
<a id="btn-band-setup-save" class="button-orange">CREATE BAND</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div id="band-setup-step-2" style="display:none;">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/template" id="template-band-setup-genres">
|
||||
|
|
@ -139,4 +140,4 @@
|
|||
<div user-id="{userId}" class="invitation">{userName}
|
||||
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13" %></a>
|
||||
</div>
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,14 @@
|
|||
<%= content_tag(:h1, 'bands') %>
|
||||
<%= render "screen_navigation" %>
|
||||
<% end -%>
|
||||
<%= form_tag('', :id => 'find-band-form') do -%>
|
||||
<%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_BAND}), :class => 'band-filter', :id => 'session-controls') %>
|
||||
<%= content_tag(:div, :class => 'content-scroller') do -%>
|
||||
<%= content_tag(:div, content_tag(:div, '', :id => 'band-filter-results', :class => 'filter-results'), :class => 'content-wrapper band-wrapper') %>
|
||||
<%= content_tag(:div, :class => 'content-body') do -%>
|
||||
<%= content_tag(:div, :class => 'content-body-scroller') do -%>
|
||||
<%= form_tag('', :id => 'find-band-form') do -%>
|
||||
<%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_BAND}), :class => 'band-filter', :id => 'session-controls') %>
|
||||
<%= content_tag(:div, :class => 'content-scroller') do -%>
|
||||
<%= content_tag(:div, content_tag(:div, '', :id => 'band-filter-results', :class => 'filter-results'), :class => 'content-wrapper band-wrapper') %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -9,160 +9,164 @@
|
|||
<h1>create session</h1>
|
||||
|
||||
<%= render "screen_navigation" %>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
<div class="content-scroller">
|
||||
<form id="create-session-form">
|
||||
<div class="content-wrapper">
|
||||
<!-- left column -->
|
||||
<div class="session-wrapper">
|
||||
<div class="session left">
|
||||
<div class="content-body">
|
||||
<div class="content-body-scroller">
|
||||
<form id="create-session-form">
|
||||
<div class="content-wrapper">
|
||||
<!-- left column -->
|
||||
<div class="session-wrapper">
|
||||
<div class="session left">
|
||||
|
||||
<h2>session info</h2>
|
||||
<br />
|
||||
<h2>session info</h2>
|
||||
<br />
|
||||
|
||||
<div id="divDescription">
|
||||
<div class="mb5">Description:</div>
|
||||
<div>
|
||||
<textarea rows=4 id="description" name="description" class="session-description"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="divGenre" class="left mr20 mt10">
|
||||
<div class="mb5">Genre:</div>
|
||||
<div id="create-session-genre">
|
||||
<%= render "genreSelector" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="left mt10">
|
||||
<div class="mb5">Band:</div>
|
||||
<div id="create-session-band">
|
||||
<select id="band-list">
|
||||
<option value="">Not a Band Session</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br clear="all" /><br />
|
||||
|
||||
<div class="mb5">Musician Access:</div>
|
||||
<div>
|
||||
<div>
|
||||
<select id="musician-access" class="left mr20">
|
||||
<option selected="selected" value="true">Public</option>
|
||||
<option value="false">Private</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="left icheckbuttons">
|
||||
<input type="radio" name="musician-access-option" id="musician-access-option-false" checked="checked" value="false" class="musician-access-false" /><label for="musician-access-option-false" class="radio-text">Open</label>
|
||||
<input type="radio" name="musician-access-option" id="musician-access-option-true" value="true" class="musician-access-true" /><label for="musician-access-option-true" class="radio-text">By Approval</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br clear="all" /><br />
|
||||
|
||||
<div class="mb5">Fan Access:</div>
|
||||
<div>
|
||||
<div>
|
||||
<select id="fan-access" class="left mr20">
|
||||
<option value="true">Public</option>
|
||||
<option selected="selected" value="false">Private</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="left icheckbuttons">
|
||||
<input type="radio" name="fan-chat-option" id="fan-chat-option-true" value="true" class="fan-chat-option-true" disabled="disabled" /><label for="fan-chat-option-true" class="radio-text">Chat</label>
|
||||
<input type="radio" name="fan-chat-option" id="fan-chat-option-false" checked="checked" class="fan-chat-option-false" value="false" disabled="disabled" /><label for="fan-chat-option-false" class="radio-text">No Fan Chat</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- right column -->
|
||||
<div class="session right">
|
||||
<h2>invite musicians</h2>
|
||||
|
||||
<br />
|
||||
<div>
|
||||
<div class="right" layout-link="select-friends">
|
||||
<a href="#" id="btn-choose-friends" class="button-grey">CHOOSE FRIENDS</a>
|
||||
</div>
|
||||
<div style="margin-right:140px;">
|
||||
Start typing friends' names or:
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<!-- friend invitation box -->
|
||||
<div class="friendbox">
|
||||
<div id="selected-friends"></div>
|
||||
<input id="friend-input" type="text" placeholder="Type a friend's name" />
|
||||
</div>
|
||||
|
||||
<div class="mt35 mb15">
|
||||
Invite friends and contacts to join you on JamKazam from:
|
||||
</div>
|
||||
<div>
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a class="btn-email-invitation">
|
||||
<%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">E-mail</div>
|
||||
</div>
|
||||
<!--
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a id="btn-facebook-invitation">
|
||||
<%= image_tag("content/icon_facebook.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Facebook</div>
|
||||
</div>
|
||||
-->
|
||||
<!-- <div class="left mr20">
|
||||
<div class="left">
|
||||
<a href="/#/createSession" title="This feature is not yet available.">
|
||||
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Twitter</div>
|
||||
</div> -->
|
||||
<div class="left left">
|
||||
<div class="left">
|
||||
<a class="btn-gmail-invitation">
|
||||
<%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Google+</div>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
<br clear="all"/>
|
||||
<br clear="all"/>
|
||||
<!-- terms -->
|
||||
<div id="divIntellectualProperty">
|
||||
<div class="terms-checkbox icheckbuttons">
|
||||
<input type="checkbox" id="intellectual-property" class="intellectual-property" />
|
||||
</div>
|
||||
<div id="divTerms" class="terms ml25">
|
||||
I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/" target="_blank">Creative Commons CC BY-NC-SA license</a> in accordance with the <a rel="external" href="http://www.jamkazam.com/corp/terms" target="_blank">JamKazam Terms of Service</a>.
|
||||
</div>
|
||||
</div>
|
||||
<br clear="all"/>
|
||||
<br clear="all"/>
|
||||
<div class="right mt10">
|
||||
<div id="divDescription">
|
||||
<div class="mb5">Description:</div>
|
||||
<div>
|
||||
<a href="#" layout-link="home" class="button-grey">CANCEL</a>
|
||||
<a href="#" id="btn-create-session" class="button-orange">JAM!</a>
|
||||
<textarea rows=4 id="description" name="description" class="session-description"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="divGenre" class="left mr20 mt10">
|
||||
<div class="mb5">Genre:</div>
|
||||
<div id="create-session-genre">
|
||||
<%= render "genreSelector" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="left mt10">
|
||||
<div class="mb5">Band:</div>
|
||||
<div id="create-session-band">
|
||||
<select id="band-list">
|
||||
<option value="">Not a Band Session</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br clear="all" /><br />
|
||||
|
||||
<div class="mb5">Musician Access:</div>
|
||||
<div>
|
||||
<div>
|
||||
<select id="musician-access" class="left mr20">
|
||||
<option selected="selected" value="true">Public</option>
|
||||
<option value="false">Private</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="left icheckbuttons">
|
||||
<input type="radio" name="musician-access-option" id="musician-access-option-false" checked="checked" value="false" class="musician-access-false" /><label for="musician-access-option-false" class="radio-text">Open</label>
|
||||
<input type="radio" name="musician-access-option" id="musician-access-option-true" value="true" class="musician-access-true" /><label for="musician-access-option-true" class="radio-text">By Approval</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br clear="all" /><br />
|
||||
|
||||
<div class="mb5">Fan Access:</div>
|
||||
<div>
|
||||
<div>
|
||||
<select id="fan-access" class="left mr20">
|
||||
<option value="true">Public</option>
|
||||
<option selected="selected" value="false">Private</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="left icheckbuttons">
|
||||
<input type="radio" name="fan-chat-option" id="fan-chat-option-true" value="true" class="fan-chat-option-true" disabled="disabled" /><label for="fan-chat-option-true" class="radio-text">Chat</label>
|
||||
<input type="radio" name="fan-chat-option" id="fan-chat-option-false" checked="checked" class="fan-chat-option-false" value="false" disabled="disabled" /><label for="fan-chat-option-false" class="radio-text">No Fan Chat</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- right column -->
|
||||
<div class="session right">
|
||||
<h2>invite musicians</h2>
|
||||
|
||||
<br />
|
||||
<div>
|
||||
<div class="right" layout-link="select-friends">
|
||||
<a href="#" id="btn-choose-friends" class="button-grey">CHOOSE FRIENDS</a>
|
||||
</div>
|
||||
<div style="margin-right:140px;">
|
||||
Start typing friends' names or:
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<!-- friend invitation box -->
|
||||
<div class="friendbox">
|
||||
<div id="selected-friends"></div>
|
||||
<input id="friend-input" type="text" placeholder="Type a friend's name" />
|
||||
</div>
|
||||
|
||||
<div class="mt35 mb15">
|
||||
Invite friends and contacts to join you on JamKazam from:
|
||||
</div>
|
||||
<div>
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a class="btn-email-invitation">
|
||||
<%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">E-mail</div>
|
||||
</div>
|
||||
<!--
|
||||
<div class="left mr20">
|
||||
<div class="left">
|
||||
<a id="btn-facebook-invitation">
|
||||
<%= image_tag("content/icon_facebook.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Facebook</div>
|
||||
</div>
|
||||
-->
|
||||
<!-- <div class="left mr20">
|
||||
<div class="left">
|
||||
<a href="/#/createSession" title="This feature is not yet available.">
|
||||
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Twitter</div>
|
||||
</div> -->
|
||||
<div class="left left">
|
||||
<div class="left">
|
||||
<a class="btn-gmail-invitation">
|
||||
<%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="right mt5 ml5">Google+</div>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
<br clear="all"/>
|
||||
<br clear="all"/>
|
||||
<!-- terms -->
|
||||
<div id="divIntellectualProperty">
|
||||
<div class="terms-checkbox icheckbuttons">
|
||||
<input type="checkbox" id="intellectual-property" class="intellectual-property" />
|
||||
</div>
|
||||
<div id="divTerms" class="terms ml25">
|
||||
I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/" target="_blank">Creative Commons CC BY-NC-SA license</a> in accordance with the <a rel="external" href="http://www.jamkazam.com/corp/terms" target="_blank">JamKazam Terms of Service</a>.
|
||||
</div>
|
||||
</div>
|
||||
<br clear="all"/>
|
||||
<br clear="all"/>
|
||||
<div class="right mt10">
|
||||
<div>
|
||||
<a href="#" layout-link="home" class="button-grey">CANCEL</a>
|
||||
<a href="#" id="btn-create-session" class="button-orange">JAM!</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
<!-- Feed Screen -->
|
||||
<div layout="screen" layout-id="feed" class="screen secondary">
|
||||
<div class="content-head">
|
||||
<div class="content">
|
||||
<div class="content-head">
|
||||
|
||||
<div class="content-icon">
|
||||
<%= image_tag "content/icon_feed.png", {:height => 19, :width => 19} %>
|
||||
<div class="content-icon">
|
||||
<%= image_tag "content/icon_feed.png", {:height => 19, :width => 19} %>
|
||||
</div>
|
||||
<h1>feed</h1>
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<div class="content-body">
|
||||
<div class="content-body-scroller">
|
||||
<p>This feature not yet implemented</p>
|
||||
</div>
|
||||
</div>
|
||||
<h1>feed</h1>
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<p>This feature not yet implemented</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,43 +10,47 @@
|
|||
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<form id="find-session-form">
|
||||
<div class="session-filter">
|
||||
<div style="min-width:770px;">
|
||||
<div class="left ml35" style="padding-top:3px;">Filter Session List:</div>
|
||||
<div class="content-body">
|
||||
<div class="content-body-scroller">
|
||||
<form id="find-session-form">
|
||||
<div class="session-filter">
|
||||
<div style="min-width:770px;">
|
||||
<div class="left ml35" style="padding-top:3px;">Filter Session List:</div>
|
||||
|
||||
<!-- genre filter -->
|
||||
<div id="find-session-genre" class="left ml10">
|
||||
<%= render "genreSelector" %>
|
||||
</div>
|
||||
<!-- genre filter -->
|
||||
<div id="find-session-genre" class="left ml10">
|
||||
<%= render "genreSelector" %>
|
||||
</div>
|
||||
|
||||
<!-- keyword filter -->
|
||||
<div class="search-box" style="height:25px;">
|
||||
<input id="session-keyword-srch" type="text" name="search" placeholder="Search by Keyword" />
|
||||
<!-- keyword filter -->
|
||||
<div class="search-box" style="height:25px;">
|
||||
<input id="session-keyword-srch" type="text" name="search" placeholder="Search by Keyword" />
|
||||
</div>
|
||||
<div class="right mr10">
|
||||
<a id="btn-refresh" href="#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right mr10">
|
||||
<a id="btn-refresh" href="#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
|
||||
<div class="content-scroller">
|
||||
<div class="content-wrapper" style="padding-left:35px;padding-top:10px;">
|
||||
<div id="sessions-invitations">
|
||||
<%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %>
|
||||
</div>
|
||||
<div id="sessions-friends" class="mt35">
|
||||
<%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %>
|
||||
</div>
|
||||
<div id="sessions-other" class="mt35">
|
||||
<%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
<div id="sessions-none-found">
|
||||
There are currently no public sessions.
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-scroller">
|
||||
<div class="content-wrapper" style="padding-left:35px;padding-top:10px;">
|
||||
<div id="sessions-invitations">
|
||||
<%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %>
|
||||
</div>
|
||||
<div id="sessions-friends" class="mt35">
|
||||
<%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %>
|
||||
</div>
|
||||
<div id="sessions-other" class="mt35">
|
||||
<%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
<div id="sessions-none-found">
|
||||
There are currently no public sessions.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -105,4 +109,4 @@
|
|||
<!-- Musician option template -->
|
||||
<script type="text/template" id="template-musician-option">
|
||||
<option value="{value}">{label}</option>
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,25 +1,29 @@
|
|||
<%= content_tag(:div, :style => "min-width:770px;") do -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= content_tag(:div, 'Filter By:', :class => 'filter-element', :style => "padding-top:3px;") %>
|
||||
<!-- order by filter -->
|
||||
<%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= content_tag(:div, :class => 'filter-element wrapper foobar') do -%>
|
||||
<%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %>
|
||||
<!-- order by filter -->
|
||||
<%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => "filter-element wrapper") do -%>
|
||||
<%= content_tag(:div, :class => 'filter-element wrapper') do -%>
|
||||
<!-- instrument filter -->
|
||||
<%= content_tag(:div, 'Instrument:', :class => 'filter-element') %>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= select_tag(:musician_instrument,
|
||||
<%= content_tag(:div, 'Instrumente:', :class => 'filter-element') %>
|
||||
<%= select_tag(:musician_instrument,
|
||||
options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] }))) %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<!-- distance filter -->
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= content_tag(:div, 'Within', :class => 'filter-element') %>
|
||||
<%= content_tag(:div, :class => 'query-distance-params') do -%>
|
||||
<%= select_tag('musician_query_distance', options_for_select(Search::M_DISTANCE_OPTS, Search::M_MILES_DEFAULT)) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => 'musician-filter-city') %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<!-- distance filter -->
|
||||
<%= content_tag(:div, :class => 'filter-element wrapper') do -%>
|
||||
<%= content_tag(:div, 'Within', :class => 'filter-element desc') %>
|
||||
<%= content_tag(:div, :class => 'query-distance-params') do -%>
|
||||
<%= select_tag('musician_query_distance', options_for_select(Search::M_DISTANCE_OPTS, Search::M_MILES_DEFAULT)) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => 'musician-filter-city') %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<%= content_tag(:div,
|
||||
link_to('REFRESH', '#',
|
||||
:id => 'btn-refresh-musicians',
|
||||
:style => 'text-decoration:none',
|
||||
:class => 'button-grey'),
|
||||
:class => 'filter-element wrapper right mr10') %>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,14 @@
|
|||
<%= content_tag(:h1, 'musicians') %>
|
||||
<%= render "screen_navigation" %>
|
||||
<% end -%>
|
||||
<%= form_tag('', :id => 'find-musician-form') do -%>
|
||||
<%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_MUSICIAN}), :class => 'musician-filter', :id => 'session-controls') %>
|
||||
<%= content_tag(:div, :class => 'content-scroller') do -%>
|
||||
<%= content_tag(:div, content_tag(:div, '', :id => 'musician-filter-results'), :class => 'content-wrapper musician-wrapper') %>
|
||||
<%= content_tag(:div, :class => 'content-body') do -%>
|
||||
<%= content_tag(:div, :class => 'content-body-scroller') do -%>
|
||||
<%= form_tag('', :id => 'find-musician-form') do -%>
|
||||
<%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_MUSICIAN}), :class => 'musician-filter', :id => 'session-controls') %>
|
||||
<%= content_tag(:div, :class => 'content-scroller') do -%>
|
||||
<%= content_tag(:div, content_tag(:div, '', :id => 'musician-filter-results'), :class => 'content-wrapper musician-wrapper') %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
|
@ -32,10 +36,10 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="left ml35 f11 whitespace w40"><br />
|
||||
{biography}<br />
|
||||
{biography}<br />
|
||||
<br />
|
||||
<div data-musician-id={musician_id}>
|
||||
{musician_action_template}
|
||||
<div class="result-list-button-wrapper" data-musician-id={musician_id}>
|
||||
{musician_action_template}
|
||||
</div>
|
||||
</div>
|
||||
<div class="left ml10 w20 musician-following">
|
||||
|
|
@ -48,7 +52,13 @@
|
|||
</script>
|
||||
|
||||
<script type="text/template" id="template-musician-action-btns">
|
||||
<a href="{profile_url}" class="button-orange smallbutton m0">PROFILE</a><% if current_user.musician? %><a href="#" class="{button_friend} smallbutton m0 search-m-friend">CONNECT</a><% end %><a href="#" class="{button_follow} smallbutton search-m-follow">FOLLOW</a><!--<a href="#" class="{button_message} smallbutton search-m-like">MESSAGE</a>-->
|
||||
<a href="{profile_url}" class="button-orange smallbutton">PROFILE</a>
|
||||
<% if current_user.musician? %>
|
||||
<a href="#" class="{button_friend} smallbutton search-m-friend">CONNECT</a>
|
||||
<% end %>
|
||||
<a href="#" class="{button_follow} smallbutton search-m-follow">FOLLOW</a>
|
||||
<!--<a href="#" class="{button_message} smallbutton search-m-like">MESSAGE</a>-->
|
||||
<div class="clearall"></div>
|
||||
</script>
|
||||
|
||||
<script type="text/template" id="template-musician-follow-info">
|
||||
|
|
|
|||
|
|
@ -9,91 +9,94 @@
|
|||
|
||||
<%= render "screen_navigation" %>
|
||||
</div>
|
||||
<form id="profile-form">
|
||||
<div class="profile-header">
|
||||
<div class="content-body">
|
||||
<div class="content-body-scroller">
|
||||
<form id="profile-form">
|
||||
<div class="profile-header">
|
||||
|
||||
<!-- profile name -->
|
||||
<h2 id="profile-username"></h2>
|
||||
<!-- profile name -->
|
||||
<h2 id="profile-username"></h2>
|
||||
|
||||
<!-- profile status -->
|
||||
<div class="profile-status">
|
||||
</div>
|
||||
<!-- profile status -->
|
||||
<div class="profile-status">
|
||||
</div>
|
||||
|
||||
<!-- action buttons -->
|
||||
<div class="right">
|
||||
<a id="btn-add-friend" class="button-orange">ADD FRIEND</a>
|
||||
<a id="btn-follow-user" class="button-orange">FOLLOW</a>
|
||||
<%= link_to("EDIT PROFILE", '/client#/account/profile', :id => "btn-profile-edit", :class => "button-orange") %>
|
||||
</div>
|
||||
<br clear="all" /><br />
|
||||
<!-- action buttons -->
|
||||
<div class="right">
|
||||
<a id="btn-add-friend" class="button-orange">ADD FRIEND</a>
|
||||
<a id="btn-follow-user" class="button-orange">FOLLOW</a>
|
||||
<%= link_to("EDIT PROFILE", '/client#/account/profile', :id => "btn-profile-edit", :class => "button-orange") %>
|
||||
</div>
|
||||
<br clear="all" /><br />
|
||||
|
||||
<!-- avatar -->
|
||||
<div class="profile-photo">
|
||||
<div class="avatar-profile">
|
||||
<img id="profile-avatar" width="200" height="200" />
|
||||
<!-- avatar -->
|
||||
<div class="profile-photo">
|
||||
<div class="avatar-profile">
|
||||
<img id="profile-avatar" width="200" height="200" />
|
||||
</div>
|
||||
</div>
|
||||
<!-- profile navigation -->
|
||||
<div class="profile-nav">
|
||||
<a id="profile-about-link" class="active">about</a>
|
||||
<a id="profile-history-link">history</a>
|
||||
<a id="profile-bands-link">bands</a>
|
||||
<a id="profile-social-link">social</a>
|
||||
<a id="profile-favorites-link" class="last">favorites</a>
|
||||
</div>
|
||||
<div class="clearall"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- profile navigation -->
|
||||
<div class="profile-nav">
|
||||
<a id="profile-about-link" class="active">about</a>
|
||||
<a id="profile-history-link">history</a>
|
||||
<a id="profile-bands-link">bands</a>
|
||||
<a id="profile-social-link">social</a>
|
||||
<a id="profile-favorites-link" class="last">favorites</a>
|
||||
</div>
|
||||
<div class="content-scroller" style="height:350px;">
|
||||
<div id="profile-about" class="profile-wrapper">
|
||||
<!-- stats & location -->
|
||||
<div class="profile-about-left">
|
||||
<h3>Location:</h3><br />
|
||||
<span id="profile-location"></span><br /><br /><br />
|
||||
<h3>Stats:</h3><br />
|
||||
<span id="profile-friend-stats"></span><br />
|
||||
<span id="profile-follower-stats"></span><br />
|
||||
<span id="profile-following-stats"></span><br />
|
||||
<span id="profile-favorite-stats"></span><br />
|
||||
<span id="profile-session-stats"></span><br />
|
||||
<span id="profile-recording-stats"></span><br />
|
||||
</div>
|
||||
<div class="profile-about-right">
|
||||
<p id="profile-biography"></p><br />
|
||||
<div id="profile-instruments">
|
||||
</div>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-history" class="profile-wrapper">
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-bands" class="profile-wrapper">
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-social" class="profile-wrapper">
|
||||
<div class="profile-social-left">
|
||||
<h2>Friends</h2>
|
||||
<div id="profile-social-friends">
|
||||
</div>
|
||||
</div>
|
||||
<div class="profile-social-mid">
|
||||
<h2>Following</h2>
|
||||
<div id="profile-social-followings">
|
||||
</div>
|
||||
</div>
|
||||
<div class="profile-social-right">
|
||||
<h2>Followers</h2>
|
||||
<div id="profile-social-followers">
|
||||
</div>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-favorites" class="profile-wrapper">
|
||||
<br clear="all" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
<div class="content-scroller" style="height:350px;">
|
||||
<div id="profile-about" class="profile-wrapper">
|
||||
<!-- stats & location -->
|
||||
<div class="profile-about-left">
|
||||
<h3><span id="profile-location-label">Location</span>:</h3><br />
|
||||
<span id="profile-location"></span><br /><br /><br />
|
||||
<h3>Stats:</h3><br />
|
||||
<span id="profile-friend-stats"></span><br />
|
||||
<span id="profile-follower-stats"></span><br />
|
||||
<span id="profile-following-stats"></span><br />
|
||||
<span id="profile-favorite-stats"></span><br />
|
||||
<span id="profile-session-stats"></span><br />
|
||||
<span id="profile-recording-stats"></span><br />
|
||||
</div>
|
||||
<div class="profile-about-right">
|
||||
<p id="profile-biography"></p><br />
|
||||
<div id="profile-instruments">
|
||||
</div>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-history" class="profile-wrapper">
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-bands" class="profile-wrapper">
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-social" class="profile-wrapper">
|
||||
<div class="profile-social-left">
|
||||
<h2>Friends</h2>
|
||||
<div id="profile-social-friends">
|
||||
</div>
|
||||
</div>
|
||||
<div class="profile-social-mid">
|
||||
<h2>Following</h2>
|
||||
<div id="profile-social-followings">
|
||||
</div>
|
||||
</div>
|
||||
<div class="profile-social-right">
|
||||
<h2>Followers</h2>
|
||||
<div id="profile-social-followers">
|
||||
</div>
|
||||
</div>
|
||||
<br clear="all" />
|
||||
</div>
|
||||
<div id="profile-favorites" class="profile-wrapper">
|
||||
<br clear="all" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/template" id="template-no-bands">
|
||||
|
|
|
|||
|
|
@ -1,36 +1,30 @@
|
|||
<% filter_label = defined?(search_type) && search_type == Search::PARAM_BAND ? :band : :musician %>
|
||||
<%= content_tag(:div, :style => "min-width:770px;") do -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= content_tag(:div, 'Filter By:', :class => 'filter-element', :style => "padding-top:3px;") %>
|
||||
<!-- order by filter -->
|
||||
<%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by"} ) %>
|
||||
<%= content_tag(:div, :class => "filter-element wrapper") do -%>
|
||||
<%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %>
|
||||
<!-- order by filter -->
|
||||
<%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by"} ) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element wrapper') do -%>
|
||||
<% if :musician == filter_label %>
|
||||
<!-- instrument filter -->
|
||||
<%= content_tag(:div, 'Instrument:', :class => 'filter-element desc') %>
|
||||
<%= select_tag("#{filter_label}_instrument",
|
||||
options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] }))) %>
|
||||
<% elsif :band == filter_label %>
|
||||
<!-- genre filter -->
|
||||
<%= content_tag(:div, 'Genre:', :class => 'filter-element desc') %>
|
||||
<%= select_tag("#{filter_label}_genre",
|
||||
options_for_select([['Any', '']].concat(JamRuby::Genre.all.collect { |ii| [ii.description, ii.id] }))) %>
|
||||
<% end %>
|
||||
<% end -%>
|
||||
<!-- distance filter -->
|
||||
<%= content_tag(:div, :class => 'filter-element wrapper') do -%>
|
||||
<%= content_tag(:div, 'Within', :class => 'filter-element desc') %>
|
||||
<%= content_tag(:div, :class => 'query-distance-params') do -%>
|
||||
<% default_distance = :musician == filter_label ? Search::M_MILES_DEFAULT : Search::B_MILES_DEFAULT %>
|
||||
<%= select_tag("#{filter_label}_query_distance", options_for_select(Search::DISTANCE_OPTS, default_distance)) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<% if :musician == filter_label %>
|
||||
<!-- instrument filter -->
|
||||
<%= content_tag(:div, 'Instrument:', :class => 'filter-element') %>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= select_tag("#{filter_label}_instrument",
|
||||
options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] }))) %>
|
||||
<% end -%>
|
||||
<% elsif :band == filter_label %>
|
||||
<!-- genre filter -->
|
||||
<%= content_tag(:div, 'Genre:', :class => 'filter-element') %>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= select_tag("#{filter_label}_genre",
|
||||
options_for_select([['Any', '']].concat(JamRuby::Genre.all.collect { |ii| [ii.description, ii.id] }))) %>
|
||||
<% end -%>
|
||||
<% end %>
|
||||
<% end -%>
|
||||
<!-- distance filter -->
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
<%= content_tag(:div, 'Within', :class => 'filter-element') %>
|
||||
<%= content_tag(:div, :class => 'query-distance-params') do -%>
|
||||
<% default_distance = :musician == filter_label ? Search::M_MILES_DEFAULT : Search::B_MILES_DEFAULT %>
|
||||
<%= select_tag("#{filter_label}_query_distance", options_for_select(Search::DISTANCE_OPTS, default_distance)) %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element') do -%>
|
||||
miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => "#{filter_label}-filter-city") %>
|
||||
<% end -%>
|
||||
<%= content_tag(:div, :class => 'filter-element desc') do -%>
|
||||
miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => "#{filter_label}-filter-city") %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
|
|
|||
Loading…
Reference in New Issue