mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-42832 course: management viewmode string improvements

Browse Source
This commit is contained in:
Sam Hemelryk 2013-11-12 14:08:25 +08:00
parent b8a598ad65
commit aa861f6297
7 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
course/classes/management_renderer.php
View File

@ -998,10 +998,10 @@ class core_course_management_renderer extends plugin_renderer_base {
$menu->add(new action_menu_link_secondary($modeurl, null, $modestr, $attributes));
}
$menu->set_menu_trigger(get_string('viewing', 'moodle', $selected));
$menu->set_menu_trigger($selected);
$html = html_writer::start_div('view-mode-selector vms');
$html .= $this->render($menu);
$html .= get_string('viewing').' '.$this->render($menu);
$html .= html_writer::end_div();
return $html;

8
course/tests/behat/course_category_management_listing.feature
View File

@ -12,7 +12,7 @@ Feature: Course category management interface performs as expected
And I log in as "admin"
And I go to the courses management page
And I should see "Course and category management" in the "h2" "css_element"
And I should see "Viewing Course categories"
And I should see "Course categories" in the ".view-mode-selector" "css_element"
And I should see "Course categories" in the "h3" "css_element"
And I should see the "Course categories" management page
@ -30,11 +30,11 @@ Feature: Course category management interface performs as expected
And I should see the "Course categories" management page
And I should see "Course categories" in the "#category-listing h3" "css_element"
And I should see "Cat 1" in the "#category-listing" "css_element"
And I should see "Viewing Course categories" in the ".view-mode-selector" "css_element"
And I should see "Course categories" in the ".view-mode-selector" "css_element"
And I should not see "Course categories and courses" in the ".view-mode-selector .menu" "css_element"
And I should not see "Course categories" in the ".view-mode-selector .menu" "css_element"
And I should not see "Courses" in the ".view-mode-selector .menu" "css_element"
When I click on "Viewing Course categories" "link" in the ".view-mode-selector" "css_element"
When I click on "Course categories" "link" in the ".view-mode-selector" "css_element"
Then I should see "Course categories and courses" in the ".view-mode-selector .menu" "css_element"
And I should see "Course categories" in the ".view-mode-selector .menu" "css_element"
And I should see "Courses" in the ".view-mode-selector .menu" "css_element"
@ -52,7 +52,7 @@ Feature: Course category management interface performs as expected
And I should see "Cat 1" in the "#course-listing h3" "css_element"
And I should see "Cat 1" in the "#category-listing" "css_element"
And I should see "Course 1" in the "#course-listing" "css_element"
When I click on "Viewing Course categories" "link" in the ".view-mode-selector" "css_element"
When I click on "Course categories" "link" in the ".view-mode-selector" "css_element"
Then I should see "Courses" in the ".view-mode-selector .menu" "css_element"
And I click on "Courses" "link" in the ".view-mode-selector .menu" "css_element"
# Redirect.

2
course/tests/behat/course_change_visibility.feature
View File

@ -92,7 +92,7 @@ Feature: We can change the visibility of courses in the management interface.
And course in management listing should be dimmed "C1"
And I toggle visibility of category "CAT1" in management listing
And I toggle visibility of course "C1" in management listing
And I click on "Viewing Course categories and courses" "link"
And I click on "Course categories and courses" "link" in the ".view-mode-selector" "css_element"
And I click on "Courses" "link"
# Redirect
And I should see "Course 1" in the "#course-listing ul.ml" "css_element"

2
lang/en/moodle.php
View File

@ -1895,7 +1895,7 @@ $string['usingexistingcourse'] = 'Using existing course';
$string['valuealreadyused'] = 'This value has already been used.';
$string['version'] = 'Version';
$string['view'] = 'View';
$string['viewing'] = 'Viewing {$a}';
$string['viewing'] = 'Viewing:';
$string['viewallcourses'] = 'View all courses';
$string['viewallcoursescategories'] = 'View all courses and categories';
$string['viewmore'] = 'View more';

1
theme/base/style/course.css
View File

@ -505,6 +505,7 @@ input.titleeditor { vertical-align: text-bottom; }
.coursecat-management-header > div > div {display:inline-block;margin-left:1em;}
.dir-rtl .coursecat-management-header h2 {text-align:right;}
.dir-rtl .coursecat-management-header > div {float:left;margin-right:1em;margin-left:0;}
.coursecat-management-header .view-mode-selector .moodle-actionmenu {display:inline-block;}
.coursecat-management-header .view-mode-selector img {margin-left:0.5em;vertical-align: baseline;}
.coursecat-management-header select {max-width: 300px;white-space: nowrap;}

13
theme/bootstrapbase/less/moodle/course.less
View File

@ -1254,11 +1254,14 @@ span.editinstructions {
vertical-align: baseline;
white-space: nowrap;
}
.moodle-actionmenu {
white-space:nowrap;
}
.moodle-actionmenu[data-enhanced].show .menu a {
padding-left:1em;
.view-mode-selector {
.moodle-actionmenu {
white-space:nowrap;
display:inline-block;
}
.moodle-actionmenu[data-enhanced].show .menu a {
padding-left:1em;
}
}
}
.dir-rtl .coursecat-management-header {

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long