From a463030f93d692d58bec25437b0b5a0aed25ef2a Mon Sep 17 00:00:00 2001
From: Jonathon Wilson <jonathon@jamkazam.com>
Date: Sat, 29 Sep 2012 11:48:23 -0600
Subject: [PATCH] Unstyled. Change create session controls to reflect spec.

---
 .gitignore                               |   1 +
 app/assets/stylesheets/jamkazam.css.scss |  25 ++-
 app/views/clients/index.html.erb         | 229 +++++++++++++----------
 3 files changed, 148 insertions(+), 107 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2320f72a..4eed927db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ doc/
 *.iml
 
 Gemfile.lock
+.sass-cache
diff --git a/app/assets/stylesheets/jamkazam.css.scss b/app/assets/stylesheets/jamkazam.css.scss
index 92d8f0d7c..dee1ab834 100644
--- a/app/assets/stylesheets/jamkazam.css.scss
+++ b/app/assets/stylesheets/jamkazam.css.scss
@@ -36,15 +36,28 @@ form {
     clear:both;
     margin: 1em;
 }
+form .body {
+    /* TODO - size with layout */
+    width: 100%;
+    height: 40%;
+    max-height: 40%;
+    overflow:auto;
+}
 fieldset {
-    border: 1px solid #555;
-    padding: 1em;
-    margin: 2em 1em;
-    width:auto;
-    float:left;
+    /*border: 1px solid #555;*/
+    /*padding: 1em;*/
+    /*margin: 2em 1em;*/
+    /*width:auto;*/
+    /*float:left;*/
+}
+fieldset.unstyled {
+    border: 1px solid #f00;
 }
 .formrow {
-    margin: 3em 0em;
+    margin: 1em;
+    padding: 1em;
+    border: 1px solid #555;
+    float:left;
 }
 label {
     display:block;
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index e3e50d962..c751a03b7 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -101,116 +101,143 @@
         <div layout="screen" layout-id="createSession" class="screen secondary">
             <div class="breadcrumb">
                 <p layout-link="home">Home &gt; </p>
-                <p class="current">Create Session (1/3): Session Info</p>
+                <p class="current">Create Session</p>
             </div>
-            <p>Viewers: If it isn't obvious, no visual work has been done on this. Just putting the &quot;stuff&quot; on the page. We should be able to start making it function, and then styling can happen in parallel later.</p>
-            <form>
-                <fieldset>
-                    <legend>Session Type</legend>
-                    <label><input type="radio" name="session-type"> Band</label>
-                    <label><input type="radio" name="session-type"> Invitation Only</label>
-                    <label><input type="radio" name="session-type"> Invitation and Request</label>
-                    <label><input type="radio" name="session-type" checked="true"> Open</label>
-                </fieldset>
-                <div class="formrow">
-                <label>Genre 
-                    <select>
-                        <option>African</option>
-                        <option>Ambient</option>
-                        <option>Asian</option>
-                        <option>Blues</option>
-                        <option>Classical</option>
-                        <option>Country</option>
-                        <option>Electronic</option>
-                        <option>Folk</option>
-                        <option>Hop Hop</option>
-                        <option>Jazz</option>
-                        <option>Latin</option>
-                        <option>Metal</option>
-                        <option>Pop</option>
-                        <option>R&amp;B</option>
-                        <option>Reggae</option>
-                        <option>Religious</option>
-                        <option>Rock</option>
-                        <option>Ska</option>
-                        <option>Other</option>
-                    </select>
-                </label>
-                </div>
-                <div class="formrow">
-                <label>Description</label>
-                <textarea></textarea>
-                </div>
-                <div class="formrow">
-                <label>
-                    <input type="checkbox"/>
-                    I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the Creative Commons CC BY-NC-SA license in accordance with the JamKazam Terms of Service.
-                </label>
-                </div>
-                <div class="footer">
-                <button layout-link="createSessionInvite">Continue</button>
-                <button layout-link="home">Cancel</button>
-                </div>
-            </form>
-        </div>
+            <form id="create-session-form">
+                <div class="body">
+                <fieldset class="unstyled">
+                    <legend>Unstyled (obviously)</legend>
+                    <div class="formrow">
+                        <label>Band
+                            <select>
+                                <option>Not a band session</option>
+                                <option>The Killers</option>
+                                <option>J&amp;J AdHoc Electronica Duo</option>
+                            </select>
+                        </label>
+                    </div>
 
-        <!-- Create Session:Invite Screen -->
-        <div layout="screen" layout-id="createSessionInvite" class="screen secondary">
-            <div class="breadcrumb">
-                <p layout-link="home">Home &gt; </p>
-                <p class="current">Create a Session (2/3): Invite</p>
-            </div>
-            <form>
-                <fieldset>
-                    <legend>Invite Musicians</legend>
-                    <label> JamKazam Friends
-                        <select>
-                            <option>David Wilson</option>
-                            <option>Brian Smith</option>
-                            <option>Peter Walker</option>
-                            <option>Seth Call</option>
-                        </select>
-                    </label>
-                    <label> Add musicians as JamKazam friends from:
-                        <a href="#">Facebook</a>
-                        <a href="#">Twitter</a>
-                        <a href="#">Google+</a>
-                        <a href="#">Email</a>
-                    </label>
-                </fieldset>
-                <fieldset>
-                    <legend>Invite Fans</legend>
-                    <label>
-                        <input type="radio" checked="checked">Yes</input>
-                        <input type="radio">No</input>
-                        Let other JamKazam musicians listen to the session
-                    </label>
-                    <label>
-                        <input type="radio" checked="checked">Yes</input>
-                        <input type="radio">No</input>
-                        Let fans listen to the session
-                    </label>
-                    <label>
-                        <input type="radio" checked="checked">Yes</input>
-                        <input type="radio">No</input>
-                        Let fans text chat with the musicians in the session
-                    </label>
-                    <label>
-                        Post session link for fans on:
-                        <a href="#">Facebook</a>
-                        <a href="#">Twitter</a>
-                        <a href="#">Google+</a>
-                    </label>
+                    <div class="formrow">
+                        <label>Musician Access
+                            <label>
+                                <input type="radio" name="musician_access"/>
+                                Public
+                            </label>
+                            <label>
+                                <input type="radio" name="musician_access"/>
+                                Private
+                            </label>
+                        </label>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Musician Access Method
+                            <label>                                
+                                <input type="radio" name="musician_access_method"/>
+                                By Request/Approval
+                            </label>
+                            <label>
+                                <input type="radio" name="musician_access_method"/>
+                                Open
+                            </label>
+                        </label>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Fan Access
+                            <label>
+                                <input type="radio" name="fan_access"/>
+                                Public
+                            </label>
+                            <label>
+                                <input type="radio" name="fan_access"/>
+                                Private
+                            </label>
+                        </label>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Fan Chat
+                            <label>
+                                <input type="radio" name="fan_chat"/>
+                                Yes
+                            </label>
+                            <label>
+                                <input type="radio" name="fan_chat"/>
+                                No
+                            </label>
+                        </label>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Genre 
+                            <select>
+                                <option>African</option>
+                                <option>Ambient</option>
+                                <option>Asian</option>
+                                <option>Blues</option>
+                                <option>Classical</option>
+                                <option>Country</option>
+                                <option>Electronic</option>
+                                <option>Folk</option>
+                                <option>Hop Hop</option>
+                                <option>Jazz</option>
+                                <option>Latin</option>
+                                <option>Metal</option>
+                                <option>Pop</option>
+                                <option>R&amp;B</option>
+                                <option>Reggae</option>
+                                <option>Religious</option>
+                                <option>Rock</option>
+                                <option>Ska</option>
+                                <option>Other</option>
+                            </select>
+                        </label>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Session Description</label>
+                        <textarea></textarea>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Musician Invitations
+                            <input type="text"/>
+                        </label>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Fan Invitations
+                            <label>
+                                <input type="checkbox"/>
+                                Post link to this session for fans on
+                            </label>
+                            <a href="#">Facebook</a>
+                            <a href="#">Twitter</a>
+                            <a href="#">Google+</a>
+                        </label>
+                        <p><a href="#">
+                            Upgrade your Studio subscription to let more fans listen
+                        </a></p>
+                    </div>
+
+                    <div class="formrow">
+                        <label>Legal Terms
+                            <input type="checkbox"/>
+                            I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the Creative Commons CC BY-NC-SA license in accordance with the JamKazam Terms of Service.
+                        </label>
+                    </div>
                 </fieldset>
+                </div>
                 <div class="footer">
-                <button layout-link="createSession">Back</button>
-                <button layout-link="createSessionAudio">Continue</button>
-                <button layout-link="home">Cancel</button>
+                    <button layout-link="session">Join Session</button>
+                    <button layout-link="home">Cancel</button>
                 </div>
             </form>
         </div>
 
         <!-- Create Session:Audio Screen -->
+        <!-- Keeping as this will move into a user settings dialog... -->
         <div layout="screen" layout-id="createSessionAudio" class="screen secondary">
             <div class="breadcrumb">
                 <p layout-link="home">Home &gt; </p>