Skip to content

Commit

Permalink
merge change to default prefs that add auto hide feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg committed Aug 9, 2014
1 parent bb0af78 commit 68868f2
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 6 deletions.
14 changes: 14 additions & 0 deletions include/header.inc.php
View file
Expand Up @@ -90,6 +90,7 @@
$custom_head .= '
' . $_custom_script;
}
$custom_head .= '<meta name="google-site-verification" content="dNU6z27-f4GLPfPishC4RK8HhFdtjvr6-Hca2GFn5to" />';
$custom_head .= '
<script type="text/javascript" src="'.AT_print($_base_path, 'url.base').'jscripts/lib/jquery-scrolltofixed-min.js"></script>
<script type="text/javascript" src="'.AT_print($_base_path, 'url.base').'jscripts/lib/jquery.cookie.js"></script>';
Expand Down Expand Up @@ -131,6 +132,19 @@
</script>';
}
}
//////////
// Analytics for ATutorSpaces course site usage tracking

$custom_head .= "\n"." <!-- // We collect anonymous usage data to help us better understand \n how ATutor is used, and to improve it to best suit those using it.\n --> <script type=\"text/javascript\">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-42182978-1', 'auto');
ga('send', 'pageview');
</script>";
/////////////
// End session timeout warning

$savant->assign('custom_css', $custom_head);
Expand Down
35 changes: 34 additions & 1 deletion include/install/db/atutor_language_text.sql
View file
Expand Up @@ -1471,6 +1471,7 @@ INSERT INTO `language_text` VALUES ('en', '_module', 'bbb_admin_setup', 'BigBlue
('en', '_template', 'custom_grade_scale', 'Custom Grade Scale', '2008-09-25 15:59:56', 'gradebook'),
('en', '_template', 'custom_icons', 'Custom Icons', '2008-08-21 10:38:11', 'course properties'),
('en', '_template', 'custom_logo', 'Custom Logo', '2014-01-27 10:38:11', 'admin custom logo'),
('en', '_template', 'custom_logo_foot_disable', 'Fixed Footer State', '2014-01-27 10:38:11', 'admin custom logo'),
('en', '_template', 'custom_logo_alt_text', 'Alternative Text', '2014-02-11 10:38:11', 'admin custom logo alt text'),
('en', '_template', 'custom_logo_enabled', 'Custom Logo State', '2014-02-11 10:38:11', 'admin custom logo state'),
('en', '_template', 'custom_logo_instructions', 'Replace the ATutor logo in the footer area with your own custom logo. The dimensions of the logo should be 153 by 46, and should be a png, jpg, or gif image file.', '2014-02-10 10:38:11', 'admin custom logo instructions'),
Expand Down Expand Up @@ -3060,4 +3061,36 @@ INSERT INTO `language_text` VALUES ('en', '_module', 'bbb_admin_setup', 'BigBlue
('en', '_template', 'you_are_here', 'You are here', '2003-10-02 16:46:28', 'ALT text Global/Local Navigation link to self'),
('en', '_template', 'zip_archive', 'Zip Archive', '2003-05-22 16:20:01', 'file manager'),
('en', '_template', 'zip_file_manager', 'Zip File Manager', '2003-05-22 16:20:14', 'file manager'),
('en', '_template', 'zip_illegal_contents', 'The contents of this archive are listed below. Illegal file types will not be extracted, and file names containing illegal characters will be translated.', '2004-08-10 15:10:04', '');
('en', '_template', 'zip_illegal_contents', 'The contents of this archive are listed below. Illegal file types will not be extracted, and file names containing illegal characters will be translated.', '2004-08-10 15:10:04', ''),
('en', '_template', 'hide_side_menu', 'Hide Side Menu', '2014-06-15 11:37:50', ''),
('en', '_template', 'show_side_menu', 'Show Side Menu', '2014-06-15 11:37:50', '');

#ADDED FOR ATUTORSPACES HELP
INSERT INTO `language_text` VALUES ('en', '_module','helpme','HelpMe',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_module','helpme_text','The HelpMe module presents a short series of prompts for new Administrators and Instructors to help them quickly learn to use ATutor effectively. Click on the checkbox below to enable or disable HelpMe. Use the HelpMe Language form below to modify the help messages presented to new users.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_module','helpme_disable','Enable/Disable HelpMe',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_module','helpme_dismiss','Dismiss',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_module','helpme_dismiss_all','Dismiss All',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_module','helpme_language','HelpMe Language',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_module','helpme_message','Message',NOW(),'');

#ADMIN
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_CREATE_A_COURSE','You can <a href="%s">Create a Course</a> by opening the Courses tab above, then opening the Create Course tab in the sub-menu that appears.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_SYS_PREFS','You will likely want to adjust the <a href="%s">System Preferences</a> to match your requirements. Open the System Preferences tab above to modify ATutor settings.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_DEFAULT_TOOLS','You can adjust the <a href="%s">Default Tools</a> that are setup in a newly created course by opening the Courses tab above, then opening the Default Tools tab in the sub-menu that appears.' ,NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_ADMIN_CREATE_USER','The administrator may want to <a href="%s">Create Users</a>, or this can be left up to instructors using the Enrollment Manager, or students can register themselves if enabled in the System Preferences. Open the Users tab above, then open the Create User Account tab in the sub-menu.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_USERS_PREFS','The <a href="%s">Default Preferences</a> can be adjusted to control settings for new users. Open the Users tab above, then open the Default Preferences tab in the sub-menu that appears.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_CHANGE_THEME','The <a href="%s">Theme Manager</a> can be used to change the appearance of ATutor, choosing from several themes provided with the system, or by uploading custom created themes. Open the System Preferences tab above, then open the Themes tab in the sub-menu.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_MANAGE_MODULE','The <a href="%s">Module Manager</a> can be used manage the features installed and enabled on your ATutor system. Open the Modules Tab above to view the modules currently installed, and open the Add Module tab in the sub-menu to add new features, either importing from the main module repository, or uploading modules you have created yourself or downloaded from the Web.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_APPLY_PATCHES','It is important keep your ATutor installation up to date using the <a href="%s">Patcher</a> to install bug fixes, security enhancements, and occassional feature adjustments. Open the Patcher tab above to review the patches installed on your system. If you are a developer, open the Create Patch tab in the sub-menu to create your own bug fixes or features that can be submitted and added to the public ATutor source code.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_CREATE_ADMIN','It can be helpful to <a href="%s">Create Administrators</a> to perform specific tasks, assigning particular administrator tools to them to manage. Open the User tab above, then open the Administrator tab in the sub-menu.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_READ_HANDBOOK','For more about using ATutor see the %s in the links at the bottom of the screen. Enter a keyword search to find information about any feature. Also notice the context sensitive ATutor Handbook tab that often appears alongside or above various tools for specific information about using that tool, and notice the <a href="%s">Help Page</a> in the upper right corner for community based help.',NOW(),'');

#Instructor
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_CREATE_COURSE','You can <a href="%s">Create a Course</a> by opening the My Courses tab above then opening the Create Course in the sub-menu that appears.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_CREATE_CONTENT','You can <a href="%s">Create Content</a> for your course that includes movies, images, slides, documents or text, among other formats. Under the Manage tab above, open Create in the Content sub-menu to add new pages. Also notice the Content Navigation block to the side, and the small toobar their that can be used to quickly add folders or pages, and to edit the menu items below. Also notice the Editor Toolbar when viewing content, for quick access to all of content management tools. ',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_COURSE_TOOLS','You can select from a range of <a href="%s">Course Tools</a> to add particular features to a course. Tools can be added to the Main Tabs above, to the menu blocks at the side, or added as icons or boxes on the course home page. To manage the tools used in your course open the Manage tab above, then open the Course Tools sub-menu.',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_ADD_USERS','After a course is setup and content added, the next step is often to <a href="%s">Create a Course List</a>, and enroll students. Students can be enrolled manually typing them in one at a time, by importing a list in a CSV text file, by adding students from those registered on the system, or allowing students to enroll themselves. To add students to your course open the Manage tab above, then open the Enrollment sub-menu. ',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_COURSE_PROPERTIES','Modify the initial <a href="%s">Course Properties</a> that were set when the course was created. Open the Manage Tab above, then open the Properties sub-menu. ',NOW(),'');
INSERT INTO `language_text` VALUES ('en', '_msgs','AT_HELP_CREATE_BACKUP','To protect your course <a href="%s">Create a Backup</a> that can be stored on your own computer, and restored in whole or in part whenever needed. Use backups to create a new session of a course, or to move a course to a different ATutor site. Also notice the tools for <a href="%s">packaging content and tests</a>, and others for exporting test data or archiving forums as additional ways to backup your course.',NOW(),'');

74 changes: 71 additions & 3 deletions include/install/db/atutor_schema.sql
View file
Expand Up @@ -1023,7 +1023,7 @@ CREATE TABLE `myown_patches_files` (
) ENGINE = MyISAM ;

# insert the default theme
INSERT INTO `themes` VALUES ('ATutor', '2.2', 'default', 'Desktop', NOW(), 'This is the default ATutor theme and cannot be deleted as other themes inherit from it. Please do not alter this theme directly as it would complicate upgrading. Instead, create a new theme derived from this one.', 2, 0);
INSERT INTO `themes` VALUES ('ATutor', '2.2', 'default', 'Desktop', NOW(), 'This is the default ATutor theme and cannot be deleted as other themes inherit from it. Please do not alter this theme directly as it would complicate upgrading. Instead, create a new theme derived from this one.', 1, 0);
INSERT INTO `themes` VALUES ('ATutor 2.1', '2.2', 'default21', 'Desktop', NOW(), 'This is the ATutor 2.1 series defailt theme.', 1, 0);
INSERT INTO `themes` VALUES ('Fluid', '2.2', 'fluid', 'Desktop', NOW(), 'Theme that implements the Fluid reorderer used to drag-and-drop the menu from side-to-side.', 1, 0);
INSERT INTO `themes` VALUES ('ATutor Classic', '2.2', 'default_classic', 'Desktop', NOW(), 'This is the ATutor Classic theme which makes use of the custom Header and logo images. To customize those images you must edit the <code>theme.cfg.php</code> in this themes directory.', 1,0);
Expand All @@ -1036,7 +1036,7 @@ INSERT INTO `themes` VALUES ('ATutor 1.6', '2.2', 'default16', 'Desktop', NOW(),
INSERT INTO `themes` VALUES ('IDI Theme', '2.2', 'idi', 'Desktop', NOW(), 'The theme created for the IDI course server.', 1, 0);
INSERT INTO `themes` VALUES ('Mobile', '2.2', 'mobile', 'Mobile', NOW(), 'This is the default theme for mobile devices.', 3, 0);
INSERT INTO `themes` VALUES('Simple', '2.2', 'simplified_desktop', 'Desktop', NOW(), 'An adapted version of the iPad theme, designed to make a desktop look like an iPad.', 1, 0);
INSERT INTO `themes` VALUES('ATutorSpaces', '2.2', 'atspaces', 'Desktop', NOW(), 'This is the default theme for the ATutorSpaces.com hosting service.', 1, 0);
INSERT INTO `themes` VALUES('ATutorSpaces', '2.2', 'atspaces', 'Desktop', NOW(), 'This is the default theme for the ATutorSpaces.com hosting service.', 2, 0);

# --------------------------------------------------------
# Table structure for table `users_online`
Expand Down Expand Up @@ -1633,7 +1633,7 @@ INSERT INTO `config` (`name`,`value`) VALUES ('transformable_oauth_expire','9360

########
# Set the default Home URL to atutorspaces.com
INSERT INTO `config` (`name`,`value`) VALUES ('home_url','http://www.atutorspaces.com');
INSERT INTO `config` (`name`,`value`) VALUES ('home_url','https://www.atutorspaces.com');

########
# Set the the intial state of the fixed footer to fixed
Expand Down Expand Up @@ -1672,3 +1672,71 @@ CREATE TABLE `calendar_notification` (
`memberid` int(11),
`status` int(8)
) ENGINE = MyISAM;


#######
# ATutorSpaces Customizations

#######
# BigBlueButton
INSERT INTO `modules` (`dir_name`,`status`,`privilege`,`admin_privilege`,`cron_interval`,`cron_last_run`)
SELECT 'bigbluebutton',2,max(privilege)*2,max(admin_privilege)*2,0,0 FROM `AT_modules`;

CREATE TABLE `bigbluebutton` (
`meeting_id` tinyint(8) unsigned NOT NULL AUTO_INCREMENT,
`course_id` tinyint(8) unsigned NOT NULL,
`course_name` varchar(155) NOT NULL,
`course_timing` varchar(15) NOT NULL,
`message` text NOT NULL,
`status` tinyint(1) unsigned NOT NULL,
PRIMARY KEY (`meeting_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

########
# Services
INSERT INTO `config` VALUES('disable_create','1');
INSERT INTO `modules` (dir_name, status, privilege, admin_privilege, cron_interval, cron_last_run)
SELECT '_core/services', 2, 0, max(admin_privilege)*2, 0, 0 FROM `AT_modules`;

########
# Payments
INSERT INTO `modules` (dir_name, status, privilege, admin_privilege, cron_interval, cron_last_run)
SELECT 'payments', 2, max(privilege)*2, max(admin_privilege)*2, 0, 0 FROM `AT_modules`;


CREATE TABLE `payments` (
`payment_id` SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
`approved` TINYINT NOT NULL DEFAULT '0',
`transaction_id` CHAR( 100 ) NOT NULL ,
`member_id` MEDIUMINT UNSIGNED NOT NULL ,
`course_id` MEDIUMINT UNSIGNED NOT NULL ,
`amount` DECIMAL( 7, 2 ) NOT NULL DEFAULT '0'
) ENGINE=MYISAM ;

CREATE TABLE `ec_course_fees` (
`course_id` smallint( 8 ) NOT NULL ,
`course_fee` DECIMAL( 7, 2 ) NOT NULL DEFAULT '0',
`auto_approve` tinyint( 1 ) default NULL ,
`auto_email` tinyint( 1 ) default NULL ,
PRIMARY KEY ( `course_id` )
) ENGINE=MyISAM;


# Add the ATutorSpaces theme, set it as the default theme, and
# set the usual Default theme just enabled.
#INSERT INTO `themes` VALUES ('ATutorSpaces', '2.2', 'atspaces', 'Desktop', NOW(), 'This is the default theme for ATutorSpaces.', 2);
#comment out the default theme in the schema above
#INSERT INTO `themes` VALUES ('ATutor', '2.2', 'default', 'Desktop', NOW(), 'This is the default ATutor theme.', 1);

#####
# HELPME
# sql file for the HelpMe module
CREATE TABLE `helpme_user` (
`user_id` mediumint(8) NOT NULL,
`help_id` mediumint(8) unsigned NOT NULL,
PRIMARY KEY (`user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

INSERT INTO `modules` (dir_name, status, privilege, admin_privilege, cron_interval, cron_last_run)
SELECT 'helpme', 2, 0, max(admin_privilege)*2, 0, 0 FROM `AT_modules`;
5 changes: 3 additions & 2 deletions include/lib/constants.inc.php
View file
Expand Up @@ -48,11 +48,12 @@
$_config_defaults['user_notes'] = 0; // disabled - whether to enable the user contributed handbook notes
$_config_defaults['theme_categories'] = 0; // disabled
$_config_defaults['custom_logo_enabled'] = 1;
$_config_defaults['custom_logo_alt_text'] = 'ATutor Logo';
$_config_defaults['custom_logo_url'] = 'http://www.atutor.ca/';
$_config_defaults['custom_logo_alt_text'] = 'ATutorSpaces Logo';
$_config_defaults['custom_logo_url'] = 'http://www.atutorspaces.com/';
$_config_defaults['main_defaults'] = 'mods/_standard/forums/forum/list.php|mods/_core/glossary/index.php|mods/_standard/file_storage/index.php|mods/_standard/social/index.php|mods/_standard/sitemap/sitemap.php|mods/_standard/photos/index.php';
$_config_defaults['home_defaults'] = 'mods/_standard/file_storage/index.php|mods/_standard/tests/my_tests.php|mods/_standard/tracker/my_stats.php|mods/_standard/directory/directory.php';
$_config_defaults['side_defaults'] = 'social|menu_menu|related_topics|users_online|glossary|search|poll|posts';

$_config_defaults['pref_defaults'] = 'a:37:{s:10:"PREF_THEME";s:7:"default";s:15:"PREF_FORM_FOCUS";i:1;s:17:"PREF_MOBILE_THEME";s:6:"mobile";s:14:"PREF_NUMBERING";i:1;s:13:"PREF_TIMEZONE";s:1:"0";s:19:"PREF_CONTENT_EDITOR";i:0;s:15:"PREF_SHOW_GUIDE";i:1;s:13:"PREF_MODIFIED";i:1;s:18:"PREF_SHOW_CONTENTS";i:1;s:31:"PREF_SHOW_NEXT_PREVIOUS_BUTTONS";i:1;s:22:"PREF_SHOW_BREAD_CRUMBS";i:1;s:28:"PREF_USE_ALTERNATIVE_TO_TEXT";i:0;s:16:"PREF_ALT_TO_TEXT";s:5:"audio";s:34:"PREF_ALT_TO_TEXT_APPEND_OR_REPLACE";s:6:"append";s:25:"PREF_ALT_TEXT_PREFER_LANG";s:2:"en";s:29:"PREF_USE_ALTERNATIVE_TO_AUDIO";i:0;s:17:"PREF_ALT_TO_AUDIO";s:4:"text";s:35:"PREF_ALT_TO_AUDIO_APPEND_OR_REPLACE";s:6:"append";s:26:"PREF_ALT_AUDIO_PREFER_LANG";s:2:"en";s:30:"PREF_USE_ALTERNATIVE_TO_VISUAL";i:0;s:18:"PREF_ALT_TO_VISUAL";s:4:"text";s:36:"PREF_ALT_TO_VISUAL_APPEND_OR_REPLACE";s:6:"append";s:27:"PREF_ALT_VISUAL_PREFER_LANG";s:2:"en";s:15:"PREF_DICTIONARY";i:0;s:14:"PREF_THESAURUS";i:0;s:16:"PREF_NOTE_TAKING";i:0;s:15:"PREF_CALCULATOR";i:0;s:11:"PREF_ABACUS";i:0;s:10:"PREF_ATLAS";i:0;s:17:"PREF_ENCYCLOPEDIA";i:0;s:18:"PREF_JUMP_REDIRECT";i:1;s:14:"PREF_FONT_FACE";s:0:"";s:15:"PREF_FONT_TIMES";s:3:"0.8";s:14:"PREF_FG_COLOUR";s:0:"";s:14:"PREF_BG_COLOUR";s:0:"";s:14:"PREF_HL_COLOUR";s:0:"";s:18:"PREF_HIDE_FEEDBACK";i:1:"12";}';

// Adjust default prefs for ATspaces,
Expand Down

0 comments on commit 68868f2

Please sign in to comment.