From b7d48e45ae3dfaae2990aa864ccfaf2733610364 Mon Sep 17 00:00:00 2001 From: Jon Jensen Date: Wed, 13 Jun 2012 16:41:41 -0600 Subject: [PATCH] fix dashboard toggle and a couple style regressions Change-Id: I47ab5610df59ec192c7296875ec1df74691ac789 --- app/coffeescripts/bundles/dashboard2.coffee | 2 +- app/coffeescripts/bundles/group.coffee | 2 -- app/coffeescripts/bundles/group_dashboard.coffee | 5 +---- app/controllers/groups_controller.rb | 14 +++++++------- app/stylesheets/g_instructure.sass | 4 ++-- app/stylesheets/registration.scss | 3 +-- app/views/groups/show.html.erb | 1 - config/build.js | 1 - public/javascripts/dashboard.js | 4 +++- 9 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 app/coffeescripts/bundles/group.coffee diff --git a/app/coffeescripts/bundles/dashboard2.coffee b/app/coffeescripts/bundles/dashboard2.coffee index 5b5a079137a..9c4525b7297 100644 --- a/app/coffeescripts/bundles/dashboard2.coffee +++ b/app/coffeescripts/bundles/dashboard2.coffee @@ -29,4 +29,4 @@ require [ todo: new TodoView comingUp: new ComingUpView - $('#content .dashboardActions').prepend(dashboardToggle('disable')) + $('#right-side').prepend(dashboardToggle('disable')) diff --git a/app/coffeescripts/bundles/group.coffee b/app/coffeescripts/bundles/group.coffee deleted file mode 100644 index b2b837e4e2f..00000000000 --- a/app/coffeescripts/bundles/group.coffee +++ /dev/null @@ -1,2 +0,0 @@ -require ['compiled/dashboardToggle'], (dashboardToggle) -> - $('#breadcrumbs').prepend(dashboardToggle('enable')) diff --git a/app/coffeescripts/bundles/group_dashboard.coffee b/app/coffeescripts/bundles/group_dashboard.coffee index 201ba71756b..dc71e1c5758 100644 --- a/app/coffeescripts/bundles/group_dashboard.coffee +++ b/app/coffeescripts/bundles/group_dashboard.coffee @@ -8,11 +8,10 @@ require [ 'compiled/views/groups/dashboard/MessageView' 'compiled/views/ActivityFeed/ActivityFeedItemsView' 'compiled/groups/dashboard/collections/ActivityFeedItemsCollection' - 'compiled/dashboardToggle' 'compiled/views/Kollections/IndexView' 'compiled/collections/KollectionCollection' -], ($, {View}, GroupDashboardView, QuickStartBarView, DiscussionView, AnnouncementView, MessageView, ActivityFeedItemsView, GroupActivityFeedItemsCollection, dashboardToggle, KollectionIndexView, KollectionCollection) -> +], ($, {View}, GroupDashboardView, QuickStartBarView, DiscussionView, AnnouncementView, MessageView, ActivityFeedItemsView, GroupActivityFeedItemsCollection, KollectionIndexView, KollectionCollection) -> $ -> window.dashboard = new GroupDashboardView @@ -32,5 +31,3 @@ require [ collection = new KollectionCollection collection.url = "/api/v1/groups/#{ENV.GROUP_ID}/collections" collection - - $('.sidebar-header').eq(0).before(dashboardToggle('disable')) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index ba9781e67c6..583481744b7 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -217,13 +217,13 @@ class GroupsController < ApplicationController end end if authorized_action(@group, @current_user, :read) - if show_new_dashboard? - @use_new_styles = true - js_env :GROUP_ID => @group.id - return render :action => :dashboard, :layout => 'new_application' - else - @home_page = WikiNamespace.default_for_context(@group).wiki.wiki_page - end + #if show_new_dashboard? + # @use_new_styles = true + # js_env :GROUP_ID => @group.id + # return render :action => :dashboard + #else + @home_page = WikiNamespace.default_for_context(@group).wiki.wiki_page + #end end end format.json do diff --git a/app/stylesheets/g_instructure.sass b/app/stylesheets/g_instructure.sass index 9954821cb2f..78fec284c73 100644 --- a/app/stylesheets/g_instructure.sass +++ b/app/stylesheets/g_instructure.sass @@ -1436,7 +1436,7 @@ form.user_content_post_form cursor: pointer .dashboard-toggle - float: right - margin: 10px 0 0 + display: block + padding: 10px 0 0 #breadcrumbs .dashboard-toggle margin: 4px 0 \ No newline at end of file diff --git a/app/stylesheets/registration.scss b/app/stylesheets/registration.scss index 62612b130c1..6b398f343d6 100644 --- a/app/stylesheets/registration.scss +++ b/app/stylesheets/registration.scss @@ -1,5 +1,4 @@ -@import 'blue/variables'; -@import 'blue/mixins'; +@import 'environment'; body { background: #fff url(/images/registration/blue-tile.png) 0 0 repeat; diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb index 0baec97d142..b7ca65a10d7 100644 --- a/app/views/groups/show.html.erb +++ b/app/views/groups/show.html.erb @@ -1,5 +1,4 @@ <% content_for :page_title do %><%= join_title @group.name, @context.full_name %><% end %> -<% js_bundle :group %> <% @active_tab = "home" %> <% content_for :auto_discovery do %> <% if @context_membership %> diff --git a/config/build.js b/config/build.js index 20d5b71d82a..f45e8f4499f 100644 --- a/config/build.js +++ b/config/build.js @@ -156,7 +156,6 @@ { name: "compiled/bundles/gradebook_uploads", exclude: ['common', 'compiled/tinymce'] }, { name: "compiled/bundles/gradebooks", exclude: ['common', 'compiled/tinymce'] }, { name: "compiled/bundles/grading_standards", exclude: ['common', 'compiled/tinymce'] }, - { name: "compiled/bundles/group", exclude: ['common', 'compiled/tinymce'] }, { name: "compiled/bundles/groups", exclude: ['common', 'compiled/tinymce'] }, { name: "compiled/bundles/jobs", exclude: ['common', 'compiled/tinymce'] }, { name: "compiled/bundles/jquery_ui_menu", exclude: ['common', 'compiled/tinymce'] }, diff --git a/public/javascripts/dashboard.js b/public/javascripts/dashboard.js index 99c67857c5f..0ef57263641 100644 --- a/public/javascripts/dashboard.js +++ b/public/javascripts/dashboard.js @@ -22,7 +22,9 @@ define([ 'jquery.instructure_misc_plugins' /* showIf */ ], function(I18n, $, dashboardToggle) { - $('#not_right_side').prepend(dashboardToggle('enable')); + var $toggle = $(dashboardToggle('enable')); + $toggle.css({float: 'right'}) + $('#not_right_side').prepend($toggle); $(function initDashbardJs(){