nav change in top-right to JamClass (kill band setup). Also fix right-navs

admin/app/admin/jam_ruby_users.rb

@@ -33,7 +33,56 @@ ActiveAdmin.register JamRuby::User, :as => 'Users' do
       row :gender
       row :email_confirmed
       row :remember_token
+      row :jamclass_credits
+      row :via_amazon
       row :image do user.photo_url ? image_tag(user.photo_url) : ''  end
+      row "Taken Lessons" do
+        table_for user.taken_lessons.order('created_at desc') do
+          column "View" do |lesson_session|  link_to("View", lesson_session.admin_url) end
+          column :created_at
+          column :status
+          column "Teacher" do |lesson_session|
+            teacher = lesson_session.teacher
+            span do
+              link_to teacher.admin_name, teacher.admin_url
+            end
+          end
+          column "Start Time" do |lesson_session|
+            span do
+              lesson_session.music_session.pretty_scheduled_start(true)
+            end
+            br
+            span do
+              lesson_session.music_session.scheduled_start
+            end
+          end
+
+        end
+      end
+      row "Taught Lessons" do
+        table_for user.taught_lessons.order('created_at desc') do
+          column "View" do |lesson_session|  link_to("View", lesson_session.admin_url) end
+          column :created_at
+          column :status
+          column "Student" do |lesson_session|
+            student = lesson_session.student
+            span do
+              link_to student.admin_name, student.admin_name
+            end
+          end
+          column "Start Time" do |lesson_session|
+            span do
+              lesson_session.music_session.pretty_scheduled_start(true)
+            end
+            br
+            span do
+              lesson_session.music_session.scheduled_start
+            end
+          end
+
+        end
+      end
+
     end
     active_admin_comments
   end

admin/app/admin/lesson_session.rb

@@ -75,13 +75,15 @@ ActiveAdmin.register JamRuby::LessonSession, :as => 'LessonSessions' do
     column "Teacher" do |lesson_session|
       teacher = lesson_session.teacher
       span do
-        link_to "#{teacher.name} (#{teacher.email})", "#{Rails.application.config.external_root_url}/client#/profile/teacher/#{teacher.id}"
+       # link_to "#{teacher.name} (#{teacher.email})", "#{Rails.application.config.external_root_url}/client#/profile/teacher/#{teacher.id}"
+        link_to teacher.admin_name, teacher.admin_url
       end
     end
     column "Student" do |lesson_session|
       student = lesson_session.student
       span do
-        link_to "#{student.name} (#{student.email})", "#{Rails.application.config.external_root_url}/client#/profile/#{student.id}"
+        #link_to "#{student.name} (#{student.email})", "#{Rails.application.config.external_root_url}/client#/profile/#{student.id}"
+        link_to student.admin_name, student.admin_url
       end
     end
   end
@@ -117,13 +119,15 @@ ActiveAdmin.register JamRuby::LessonSession, :as => 'LessonSessions' do
       row "Teacher" do |lesson_session|
         teacher = lesson_session.teacher
         span do
-          link_to teacher.admin_name, "#{Rails.application.config.external_root_url}/client#/profile/teacher/#{teacher.id}"
+         # link_to teacher.admin_name, "#{Rails.application.config.external_root_url}/client#/profile/teacher/#{teacher.id}"
+          link_to teacher.admin_name, teacher.admin_url
         end
       end
       row "Student" do |lesson_session|
         student = lesson_session.student
         span do
-          link_to student.admin_name, "#{Rails.application.config.external_root_url}/client#/profile/#{student.id}"
+         # link_to student.admin_name, "#{Rails.application.config.external_root_url}/client#/profile/#{student.id}"
+          link_to student.admin_name, student.admin_url
         end
       end
       row "Followup Emails Sent" do |lesson_session|

ruby/lib/jam_ruby/models/user.rb

@@ -1459,7 +1459,8 @@ module JamRuby
             #else
               body = "Name: #{user.name}\n"
               body << "Email: #{user.email}\n"
-              body << "Admin: #{user.admin_student_url}\n"
+              body << "Student List: #{user.admin_student_url}\n"
+              body << "User Page: #{user.admin_url}\n"
               if posa_card
                 body << "Package Details: \n"
                 body << "        Package: #{posa_card.lesson_package_type.id}\n"

web/app/assets/stylesheets/client/help.scss

@@ -1,7 +1,7 @@
 @import "client/common";
 
 //body.jam, body.web, .dialog{
-html body {
+html {
   .bt-wrapper {
     font-size: 14px;
     font-family: 'Raleway', Arial, Helvetica, sans-serif;
@@ -97,7 +97,7 @@ html body {
       }
 
 
-      .side-remaining-test-drives, .side-buy-test-drive, .side-buy-normal-lesson, .side-didnt-find-teacher {
+      .side-remaining-jamclass-credits, .side-remaining-test-drives, .side-buy-test-drive, .side-buy-normal-lesson, .side-didnt-find-teacher {
         h2 {
           font-size:20px;
           color:white;

web/app/assets/stylesheets/client/react-components/TeacherSearch.scss

@@ -87,6 +87,7 @@
     width:100%;
     margin-bottom:16px;
     font-size:12px;
+    line-height:normal;
   }
   .teacher-actions {
     a {

web/app/views/clients/_help.html.slim

@@ -424,7 +424,7 @@ script type="text/template" id="template-help-jamtrack-upgrade"
 
 script type="text/template" id="template-help-side-remaining-jamclass-credits"
   .side-remaining-jamclass-credits
-    h2 Book TestDrive Lesson
+    h2 Book JamClass Lesson
     p You currently have {{data.jamclass_credits}} JamClass lesson credits available.
     a.book-now.button-orange BOOK NOW!
 

web/app/views/users/_user_dropdown.html.erb

@@ -50,8 +50,8 @@
     <% if @nativeClient && Rails.application.config.jamblaster_menu %>
       <li class="jamblaster-config"><%= link_to "JamBlaster Settings", '/client#/jamblaster' %></li>
     <% end %>
-    <% if current_user && current_user.musician? %>
+    <% if current_user %>
-      <li class="band-setup"><%= link_to "Band Setup", '/client#/band/setup/new' %></li>
+      <li class="band-setup"><%= link_to "JamClass", '/client#/jamclass' %></li>
     <% end %>
     <li class="invite-friends"><span class='menuheader'><span class="arrow-right"></span><%= link_to "Invite Friends", '#' %></span>
       <ul class="shortcuts-submenu">