diff --git a/app/assets/javascripts/configureTrack.js b/app/assets/javascripts/configureTrack.js index 09364021c..fc50205f3 100644 --- a/app/assets/javascripts/configureTrack.js +++ b/app/assets/javascripts/configureTrack.js @@ -101,20 +101,20 @@ function toggleTrack2ConfigDetails(visible) { if (visible) { - $('#track2-arrows-div').show(); - $('#track2-input-div').show(); - $('#track2-instrument-div').show(); - - $('#track1-input').height('70px'); - $('#track1-instrument').height('70px'); + $('#track2-details').show(); + $('#track2-input-buttons').show(); + $('#track1-input').height('92px'); + $('#track1-instrument').height('92px'); + $('#track1-input-buttons').addClass('mt30'); + $('#track1-input-buttons').removeClass('mt65'); } else { - $('#track2-arrows-div').hide(); - $('#track2-input-div').hide(); - $('#track2-instrument-div').hide(); - - $('#track1-input').height('145px'); - $('#track1-instrument').height('145px'); + $('#track2-details').hide(); + $('#track2-input-buttons').hide(); + $('#track1-input').height('195px'); + $('#track1-instrument').height('195px'); + $('#track1-input-buttons').addClass('mt65'); + $('#track1-input-buttons').removeClass('mt30'); } } @@ -713,7 +713,8 @@ this.initialize = function() { events(); _init(); - toggleTrack2ConfigDetails(myTrackCount > 1); + // toggleTrack2ConfigDetails(myTrackCount > 1); + toggleTrack2ConfigDetails(false); }; this.showMusicAudioPanel = showMusicAudioPanel; diff --git a/app/assets/stylesheets/client/jamkazam.css.scss b/app/assets/stylesheets/client/jamkazam.css.scss index aabd97056..1dd272918 100644 --- a/app/assets/stylesheets/client/jamkazam.css.scss +++ b/app/assets/stylesheets/client/jamkazam.css.scss @@ -381,14 +381,30 @@ input[type="text"], input[type="password"]{ width:20%; } +.w25 { + width:25%; +} + +.w27 { + width:27%; +} + .w30 { width:30%; } +.w38 { + width:38%; +} + .w40 { width:40%; } +.w45 { + width:45%; +} + .w50 { width:50%; } diff --git a/app/assets/stylesheets/client/screen_common.css.scss b/app/assets/stylesheets/client/screen_common.css.scss index b105f40f6..e5d6bda4c 100644 --- a/app/assets/stylesheets/client/screen_common.css.scss +++ b/app/assets/stylesheets/client/screen_common.css.scss @@ -252,6 +252,10 @@ a img { margin-right:35px; } +.mr40 { + margin-right:40px; +} + .mr120 { margin-right:120px; } @@ -280,6 +284,10 @@ a img { margin-left:35px; } +.ml45 { + margin-left:45px; +} + .mt5 { margin-top:5px; } @@ -288,6 +296,22 @@ a img { margin-top:10px; } +.mt15 { + margin-top:15px; +} + +.mt20 { + margin-top:20px; +} + +.mt25 { + margin-top:25px; +} + +.mt30 { + margin-top:30px; +} + .mt35 { margin-top:35px; } @@ -296,6 +320,22 @@ a img { margin-top:40px; } +.mt45 { + margin-top:45px; +} + +.mt50 { + margin-top:50px; +} + +.mt55 { + margin-top:55px; +} + +.mt65 { + margin-top:65px; +} + .mb5 { margin-bottom:5px; } diff --git a/app/views/clients/_addTrack.html.erb b/app/views/clients/_addTrack.html.erb index 28eccfd61..596b2884a 100644 --- a/app/views/clients/_addTrack.html.erb +++ b/app/views/clients/_addTrack.html.erb @@ -5,37 +5,59 @@

add a track

- Use arrow buttons to assign audio inputs to this new track, and choose what instrument you are playing on this track. Please note that you may only use one audio device for all audio inputs and outputs. If you don't see an audio device you think should be listed view this help topic to understand why.
-
-
- Unused Inputs:
- -

- ADD NEW AUDIO GEAR +
+ Use arrow buttons to assign audio inputs to this new track, and choose what instrument you are playing on this track. Please note that you may only use one audio device for all audio inputs and outputs. If you don't see an audio device you think should be listed view this help topic to understand why.
-
-
-
- -
-
- + +
+ +
+
+
Unused Inputs:
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
Track 2 Input:
+
+
+ +
+
+
+
+
Track 2 Instrument:
+
+
+ +
+
- Track 2 Input:
-
-
- Track 2 Instrument:
- +
+
+
+ ADD NEW AUDIO GEAR +
+
+ CANCEL  + ADD TRACK +
-

-
- CANCEL  - ADD TRACK -
-
+
\ No newline at end of file diff --git a/app/views/clients/_configureTrack.html.erb b/app/views/clients/_configureTrack.html.erb index 949d47654..75f8ede0f 100644 --- a/app/views/clients/_configureTrack.html.erb +++ b/app/views/clients/_configureTrack.html.erb @@ -9,122 +9,177 @@ Music Audio Voice Chat
- -

+
+ +
- -
- Audio Driver:
- -

- Unused Inputs:
- -

- Unused Outputs:
- -

- ADD NEW AUDIO GEAR -
- - -
-
-




- -
-
- + +
+
+
+
Audio Driver:
+
+
+ +
+
+
-
- DRIVER SETTINGS...


- Track 1 Input:
- -

-
-
- -
-
- -
-
- Track 2 Input:
- -
-

-
-
-
- -
-
- -
-
- Session Audio Output:
-
- - -
-



- Track 1 Instrument:
- -
-
-
- Track 2 Instrument:
- +
+ + +
+
+
Unused Inputs:
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
Track 1 Input:
+
+
+ +
+
+
+
Track 1 Instrument:
+
+
+ +
+
+ +
+ +
+
+
Track 2 Input:
+
+
+ +
+
+
+
Track 2 Instrument:
+
+
+ +
+
+
+
- -
+ +
+ + +
+
+
Unused Outputs:
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
Session Audio Output:
+
+
+ +
+
+
+
+