diff from rc1 and rc2. Changed draggableviews branch from master to 7.x-2.x

d4eeee59 · tstruyk · d4eeee59 · d4eeee59 · d4eeee59 · d4eeee59
Commit d4eeee59 authored Aug 15, 2012 by tstruyk
7 changed files
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
+CHANGELOG for UW Base Profile for Drupal 7
+
+Ticket numbers are for UW RT tickets
+
+UW Base Profile 7.x-1.5.5.1
+===========================
+Contrib module changes:
+- updated Select (or Other) 7.x-2.13 to 7.x-2.14
+- updated Clientside Validation 7.x-1.33 to 7.x-1.34
+Modded contrib module changes:
+- additional change to Insert 7.x-1.1
+Features module changes:
+- updated uWaterloo WYSIWYG CKEditor 7.x-2.8 to 7.x-2.8.1
+- updated uWaterloo Content Type Contact 7.x-1.14 to 7.x-1.15
+Themes changes:
+- updated uWaterloo FDSU Theme 7.x-2.12 to 7.x-2.12.1
+Attached RTs:
+238193: (lkmorlan) clientside_validation incompatible with file upload components
+241677: (kpaxman) Script error in IE
+242752: (kpaxman) Odd things happen when certain characters are in a file description
+242867: (kpaxman) no space below "events by date" and "news archive"
+242933: (kpaxman) Whitespace needed between categories listing and graphics in right sidebar - WCMS
+243069: (lkmorlan) WCMS web form error 500 - HIRE UW site
+
+
+UW Base Profile 7.x-1.5.5
+=========================
+
+Contrib module changes:
+- added CAPTCHA 7.x-1.0-beta2
+- updated CAS from 7.x-1.1 to 7.x-1.2
+- updated Clientside Validation from 7.x-1.31 to 7.x-1.33
+- updated Content Lock from 7.x-1.3 to 7.x-1.4
+- updated Entity from 7.x-1.0-rc1 to 7.x-1.0-rc3
+- fixed URLs and version numbers for jQuery Colorpicker and jQuery Update (each had the other's)
+- added Postal Code Validation 7.x-1.0-rc3
+- added reCAPTCHA 7.x-1.7
+- updated Select or Other from 2.10 to 2.13
+- moved Term Reference Tree 7.x-1.9 to modded section
+- updated Webform 7.x-3.18 to add patch, moved to modded section
+- moved WYSIWYG 7.x-2.x-dev to the modded section (additional modifications since previous release)
+Custom module changes:
+- added Menu Operations Permission 7.x-1.0
+- updated Menu Pathauto Fix from 7.x-1.4 to 7.x-1.6
+- updated uWaterloo Accessibility Module from 7.x-1.4 to 7.x-1.5
+- updated uWaterloo Web Form Additional Functionality 7.x-1.2 to 7.x-1.3
+- updated uWaterloo LDAP 7.x-1.2 to 7.x-1.3
+- updated uWaterloo Security 7.x-1.1 to 7.x-1.3
+Development module changes:
+- removed Backup and Migrate
+Features module changes:
+- updated uWaterloo Content Type Blog 7.x-1.2 to 7.x-1.3
+- updated uWaterloo Content Type Contact 7.x-1.12 to 7.x-1.14
+- updated uWaterloo Content Type Custom Listing 7.x-1.1 to 7.x-1.2
+- updated uWaterloo Content Type Event 7.x-1.10 to 7.x-1.12
+- updated uWaterloo Content Type Home Page banner 7.x-1.9 to 7.x-1.10
+- updated uWaterloo Content Type News item 7.x-1.9 to 7.x-1.10
+- updated uWaterloo Content Type Person Profile 7.x-1.8 to 7.x-1.9
+- updated uWaterloo Content Type Promo Item 7.x-1.6 to 7.x-1.7
+- updated uWaterloo Content Type Web Form 7.x-1.4 to 7.x-1.5
+- updated uWaterloo Content Type Web Page 7.x-1.6 to 7.x-1.7
+- updated uWaterloo Dashboard FDSU 7.x-1.4 to 7.x-1.5
+- updated uWaterloo Feed - Daily Bulletin (Main) 7.x-1.0 to 7.x-1.1
+- updated uWaterloo Feed - Events (Main) 7.x-1.1 to 7.x-1.2
+- updated uWaterloo Navigation Global Footer 7.x-1.4 to 7.x-1.6
+- updated uWaterloo Navigation Global Header 7.x-1.2 to 7.x-1.3
+- added uWaterloo Navigation Menu Operations Permission 7.x-1.0
+- updated uWaterloo Site FDSU 7.x-1.9 to 7.x-1.11
+- updated uWaterloo Site Feature Stories 7.x-1.0 to 7.x-1.1
+- updated uWaterloo Site Main 7.x-1.0 to 7.x-1.1
+- updated uWaterloo User Management 7.x-1.1 to 7.x-1.2
+- updated uWaterloo Workbench Config 7.x-1.6 to 7.x-1.7
+- updated uWaterloo WYSIWYG CKEditor 7.x-2.6 to 7.x-2.8
+Themes changes:
+- updated uWaterloo Admin Theme 7.x-1.1 to 7.x-1.2
+- updated uWaterloo Core Base Theme 7.x-1.8 to 7.x-1.10
+- updated uWaterloo FDSU Theme 7.x-2.9 to 7.x-2.12
+- updated uWaterloo Generic Theme 7.x-1.4 to 7.x-1.5
+Attached RTs:
+224369: (lkmorlan) Address type added to Web Form component type
+224866: (kpaxman) Banner Slideshow accessibility review
+229863: (lkmorlan) Image insert: All "Add a new file" methods show
+231041: (kpaxman) https linking back to home page
+233654: (lkmorlan) CAS 7.x-1.2
+233713: (lkmorlan) WAVE checker shows empty h3 tags under News & Events
+235004: (kpaxman) Facebook and Twitter colours
+236895: (mnshantz) Contacts Additional Information textarea
+236996: (ccarigna) Generic template update
+237047: (kpaxman) revert css to allow tables to extend into the sidebar
+237371: (mnshantz) Audience taxonomy list will not stay expand
+237560: (tstruyk) Error message for backup and migrate module
+237597: (kpaxman) Generic template log in link misplaced
+237639: (mnshantz) webform results tab disappeared
+237819: (mnshantz) Site managers should be able to assign the "form results access" permission
+237826: (mnshantz) remove access to edit/delete operations in My Workbench/Menus tab
+237832: (mnshantz) Remove Content Authors access to My Workbench/Menus tab
+237849: (kpaxman) Banner configuration is blank on some sites
+238300: (lkmorlan) uw_security doesn't work with drush
+238341: (kpaxman) Strike through stripped upon Save
+238375: (kpaxman) Some field titles aren't bold
+238473: (mnshantz) Contacts in multiple groups appear more than once on the Contacts landing page
+238520: (kpaxman) Indentation class present but not being applied on lists
+238531: (ccarigna) Update global header & footer styles
+239281: (mnshantz) Please apply patch for "search"
+239355: (mnshantz) Custom listing page not in list in Workbench-Create/Manage content
+239378: (tstruyk) Spacing is too thin at the top of nested lists
+239625: (kpaxman) Webform: Workbench create/manage content link goes to add page instead of management page.
+239634: (mnshantz) Workbench create/manage sorting gone in trunk
+240256: (lkmorlan) Change image text for listing page images
+240844: (tstruyk) No default spacing between fields.
+240878: (mnshantz) Topic blocks show topics with no content
+241362: (kpaxman) Archived Events (older than 3 years) displaying page not found message
+
+
+UW Base Profile 7.x-1.5.4
+=========================
+
+
+UW Base Profile 7.x-1.5.3
+=========================
+
+Fixes to the menu pathauto fix module - it was leaving old node aliases behind
+
+
+UW Base Profile 7.x-1.5.2
+=========================
+
+#224094 by kpaxman: Event sorting fixed to be more consistent
+#226321 by kpaxman: Users can now display different types of lists
+#228782 by kpaxman: Add to the Home page banner description
+#234734 by kpaxman: Increased font size for Login link on generic template
+#234775 by kpaxman: Changed help text in Image Gallery content type
+#235004 by kpaxman: Facebook and Twitter colours
+#235011 by kpaxman: Date on events is now using a 12 hour am/pm clock
+#235246 by kpaxman: Contacts: WatIAM userid field now appears in the correct location
+#235725 by lkmorlan: Web form bug fix: label now shows when 'other' option selected
+#235873 by kpaxman: Bullet placement fix
+#236110 by kpaxman: Changed defaults for banner slideshows
+#236327 by lkmorlan: Styling added for Definition Lists / Interface for Definition Lists
+#236407 by kpaxman: Add Content Menu feature no longer shows as overridden on fresh install
+#236594 by kpaxman: Facebook widget to SLC page (widgets with page/name/number format now allowed)
+
+
+UW Base Profile 7.x-1.5.1
+=========================
+
+#235998 by kpaxman: Update global header and footer links for CPA
+
+
+UW Base Profile 7.x-1.5
+=======================
+
+#207237 by kolafson: IMCE strongarm variables set with Features are overridden on a fresh install (with nothing) - fixed
+#209596 by mnshantz: Ability to group contacts by user controlled vocabulary
+#214124 by kpaxman: Content Authors should be able to create twitter widgets
+#214125 by kpaxman: Content Authors should be able to create facebook widgets
+#214161 by temiller: Users should be warned if they want to edit something another user is working on
+#217057 by lkmorlan: Date format not defined in "event" content type
+#220686 by lkmorlan: WCMS: Turning text into a link sometimes makes the link include spurious whitespace
+#221073 by lkmorlan: Expand menus to About/Our People when on a single contacts page.
+#221703 by kolafson: Workbench, My Content, Title should link to the published version of the page - fixed
+#221929 by lkmorlan: H1 is no longer spanning the body and sidebar
+#222588 by kpaxman: Add additional help text to event content type
+#223168 by kpaxman: Change user action buttons to + Add UW user and + Add external/test user
+#223723 by lkmorlan: http:// required in related links URL field but not Events
+#224795 by l26yan: Add a print style sheet
+#224959 by kpaxman: WCMS event date displaying incorrectly on home page - fixed
+#225342 by kpaxman: "show as expended" menu children not styled properly - fixed
+#225353 by kpaxman: can't paste in editor after switching from code view - fixed
+#225519 by kpaxman: In Workbench Files, the On Node column is empty for uploaded files - fixed
+#225581 by ccarigna: Add College colours to generic template
+#225973 by kpaxman: Webform: Body area should clear all floats at bottom - fixed
+#226043 by kpaxman: Teaser breaks not working - fixed
+#226045 by kolafson: Links not appearing as links on news listing page - fixed
+#226061 by kpaxman: Youtube: fake element in editor has title text and alt text of "unknown object" - fixed
+#226168 by lkmorlan: Users would like a role that can only download webform results
+#226170 by lkmorlan: Webform: Pipe appears in select value, key is blank - fixed
+#226484 by mnshantz: "contact for" breaks up on certain browsers - fixed
+#226723 by kpaxman: Webform: description for select boxes can extend past page frame in some browsers - fixed
+#226929 by kpaxman: RSS name should include the site name - fixed
+#227463 by lkmorlan: Contact name (from WatIAM) display is reversed - fixed
+#227831 by kpaxman: When banner slideshow is turned on, some unrelated features get marked as overwritten - fixed
+#227902 by kolafson: Updates from contrib (calendar, ctools, date, draggableviews, drupal_reset, features, feeds_xpathparser, location, location_feeds, options_element, strongarm, term_reference_tree, views, webform, xmlsitemap)
+#228453 by kpaxman: File Insert button should not add class="image-left" - fixed
+#228480 by kpaxman: Spaces being removed on People profile listing page (content running together) - fixed
+#228782 by kpaxman: Add to the Home page banner description
+#229231 by lkmorlan: Webform: Add contact person to content type
+#229269 by kpaxman: Events do not appear in Workbench - fixed
+#229311 by lkmorlan: Upload a file is missing the insert button - fixed
+#230174 by kpaxman: University wordmark in FDSU theme should point to uwaterloo.ca - fixed
+#231113 by kolafson: Need to update phpCAS library to 1.3.1
+#231164 by btlang: Notice: Undefined variables in menu_pathauto_fix - fixed
+#229858 by mnshantz: News by Audience block error message - fixed
+#231544 by kolafson: Upgrade CKEditor library to 3.6.3
+#231655 by kpaxman: Need to be able to embed Livestream video
+
+
+UW Base Profile 7.x-1.4
+=======================
+
+#213841 by kpaxman: Display the friendly path in autocomplete to help users differentiate same-named links
+#217395 by kpaxman: Fix broken links when uploading a file containing spaces in the filename
+#213861 by kpaxman: Add "clone" option to actions tab for web pages
+#222327 by kpaxman: Make "rearrange" icon different from "add" icon in Workbench
+#221499 by kpaxman: Ignore extra leading and trailing spaces when determining promo item visibility
+#222406 by kpaxman: Update events views to show events that include the current date, even if they started earlier
+#214115 by kpaxman: Add home page banner slideshow capability
+#221683 by lkmorlan: Provide form capability
+#214019 by btlang: Path structure should be determined by site hierarchy
+#214609 by javoskam: WCMS auto logout fix
+#223305 by kolafson: Site managers now able to manage multiple shortcut bars
+#224314 by javoskam: PHP sessions must end when browser closed
+#224601 by lkmorlan: Embed videos with HTTPS
+#224685 by kpaxman: Ordered list margin fix
+#214111 by mnshantz: Added RSS feeds for events
+#214113 by mnshantz: Added RSS feeds for news items
+#214905 by kpaxman: "Add a new file" option disappears when a non-uploaded image is added to a web page - fixed
+#214958 by kpaxman: Fix for fields missing auto complete
+#215632 by kolafson: Content authors can now add custom page titles with meta tags
+#216311 by mnshantz: News and Events filtering blocks made consistent
+#217395 by kpaxman: Fix for uploading a file where filename includes spaces
+#220045 by kolafson: Increase number of person profiles from 3 to 5
+#221242 by lkmorlan: News and promo items bodies now required
+#221253 by lkmorlan: uw_auth_wcms_admins module now uses ldap/group membership to grant admin access upon login
+#221499 by kpaxman: Fix for promotional item visibility does not work when extra white space is present
+#221930 by ccarigna: Add "required" text beside * for required fields
+#221826 by javoskam: Upgrade to Drupal 7.12 (http://drupal.org/node/1425104 for release notes)
+#222104 by kolafson: Update Libraries module from 7.x-2.0-alpha1 to 7.x-2.0-alpha2 (http://drupal.org/node/1371706 for release notes)
+#222106 by kolafson: Update Redirect module from 7.x-1.0-beta3 to 7.x-1.0-beta4 (http://drupal.org/node/1365170 for release notes)
+#222109 by kolafson: Upgrade References module from 7.x-2.x-dev to 7.x-2.0 final (http://drupal.org/node/1380830 for release notes)
+#222110 by kolafson: Upgrade Role Assign module from 7.x-1.0-beta2 to 7.x-1.0-rc1 (http://drupal.org/node/1353242 for release notes)
+#222112 by kolafson: Upgrade Strongarm module from 7.x-2.0-beta4 to 7.x-2.0-beta5 (http://drupal.org/node/1373018 for release notes)
+#222113 by kolafson: Upgrade Token module from 7.x-1.0-beta7 to 7.x-1.0-rc1 (http://drupal.org/node/1422936 for release notes)
+#223833 by kolafson: PDF icon added for Manage PDFs link
+#222346 by mnshantz: Lock down official taxonomy terms and open up taxonomy access for site managers
+#223074 by kpaxman: Fix for banner links being cut off
+#223408 by kpaxman: Fix for images appearing squished within table
+#224263 by kpaxman: Fix for chrome issues with WCMS theme - text over other text, etc
+#224271 by kpaxman: Fix for image galleries can't be placed in Information for menu hierarchy
+#224597 by kpaxman: Added "start" attribute to allowed list for numbered lists
+#225508 by kolafson: Update schema.org module to 7.x-1.0-beta2 - now has native features support (http://drupal.org/node/1439946 for release notes)
+#214118 by temiller: Users should be able to check their sites for broken links with an automated process
+
+
+UW Base Profile 7.x-1.3
+=======================
+
+#209535 by mnshantz: Change order of content types from most to least used
+#210127 by kpaxman: Implement property/attribute filters (WYSIWYG Filter put in place)
+#210139 by mnshantz: Users shouldn't be able to delete content easily - archive instead to avoid accidents
+#211305 by ccarigna: Add a button when logged in to 'view as anonymous user'
+#211770 by kolafson: Terms added and rearranged in Profile Type Taxonomy
+#213607 by kolafson: Menus now appear on 404 pages
+#213858 by ccarigna: A 2 column template is now available for sitebar content
+#213863 by ccarigna: Styling fixes for visited links
+#213976 by leharris: Image gallery content type added
+#215135 by kolafson: Fix for banner image urls being cut off
+#215309 by kpaxman: Fix for Contact content type LDAP lookup for hidden users
+#215590 by kpaxman: Fix for Paste with Plain Text not inserting text
+#215910 by javoskam: Upgrade Drupal Core from 7.9 to 7.10
+#215926 by ccarigna: Fixes to site footer styling
+#216765 by kolafson: Schema.org module update
+#219173 by kolafson: Views module updated to 3.0
+#219176 by kolafson: Draggable views updated to latest dev
+#219555 by kpaxman: Live remote images now available, not cached locally anymore
+#219695 by javoskam: CAS default domain variable set to uwaterloo.ca
+
+
+UW Base Profile 7.x-1.2
+=======================
+
+#213864 by kpaxman: Fix for losing content when switching to source view
+#214021 by kpaxman: Added "not" functionality for promotional item placement
+#214024 by ccarigna: Added thumbnail images for events and news items
+#214811 by kolafson: Updating CAS module to 7.x-1.1
+#214832 by kolafson: Update Pathauto persistent state module to 7.x-1.2
+#214838 by kpaxman: Site managers can now clear the cache
--- a/README.txt
+++ b/README.txt
+Prerequisites
+-------------
+
+PHP is required, the install profile has been tested with version 5.3.3.
+
+The install profile uses a lot of memory when installing, and the typical default PHP memory limit of 128MB is not enough.  A 512MB limit is recommended to avoid installation issues.
+
+The LDAP module for PHP5 is required for the Contact Feature to retrieve user information from LDAP (php5-ldap). This module may not be installed by default.
+
+A copy of Drupal is also required; this version of the install profile has been tested on Drupal 7.10.
+
+In order to retrieve all the files required for the install, the rebuild.sh script requires the installation of Drush (http://drupal.org/project/drush), Drush Make (http://drupal.org/project/drush_make) and Subversion (SVN).
+
+Drush Make may work from several locations. One good place to save it is in a hidden .drush folder in your home folder. Ex. ~/.drush/drush_make/<files go here>
+
+Finally, a database installation is also required. mySQL is recommended, and the install profile has been tested on 5.5.16.
+
+
+Installation
+------------
+
+To get things started, the profile files should be copied to "drupal/profiles/uw_base_profile".
+
+Following that, run "./rebuild.sh" from the "drupal/profiles/uw_base_profile" folder to pull down all the required themes, modules, features and libraries.
+
+After that is complete, start a Drupal site installation process (http://<your Drupal site address>/install.php)
+
+If the profile is sitting in the correct folder, you should see "uWaterloo Base Profile" in addition to the usual Standard and Minimal installation profiles. Select that and press the "Save and continue" button.
+
+On the next page, "Choose language", select English and continue.
+
+The "Verify requirements" page will only appear if you are not satisfying a requirement, for example by having incorrect folder permissions. You must satisfy all requirements to proceed.
+
+The "Set up database" page appears if your database information was not previously configured. Enter your database information and press "Save and continue".
+
+The "Install profile" page will appear as Drupal is installing.
+
+Once that is complete, you will be at the "Configure site" page. This is the standard Drupal site configuration page; enter the information and continue. Please note that you are creating a admin local user for this point and not a CAS user. Press "Save and continue".
+
+On the next page "Optionally enable a site controller", you will probably want to select the FDSU configuration (unless you want to turn on all the components individually).
+
+Next is the "Enable features" page. Here you can enable the content types you want to use on your site. The web page content type is turned on by default. Additionally, you can enable modules that help with development here. Please do not enable these modules on a production site.
+
+Finally, you can choose to have some basic pages created for you. The last stage can take several minutes to complete, regardless of whether or not you create pages.
--- a/rebuild.sh
+++ b/rebuild.sh
+#!/bin/sh
+rm -rf libraries modules themes
+drush make --working-copy --no-core -y --contrib-destination=. uw_base_profile.make
+chmod -R g+w *
+# this is getting installed by rules module, so we'll pull it out.
+rm -rf modules/entity
--- a/uw_base_profile.info
+++ b/uw_base_profile.info
+name = uWaterloo Base Profile
+description = uWaterloo base Installation Profile.  Has options to install Main and FDSU sites.
+version = 7.x-1.5.5.1
+core = 7.x
+
+dependencies[] = block
+dependencies[] = color
+dependencies[] = contextual
+dependencies[] = dashboard
+dependencies[] = help
+dependencies[] = image
+dependencies[] = list
+dependencies[] = menu
+dependencies[] = number
+dependencies[] = options
+dependencies[] = path
+dependencies[] = taxonomy
+dependencies[] = dblog
+dependencies[] = search
+dependencies[] = toolbar
+dependencies[] = field_ui
+dependencies[] = file
+dependencies[] = rdf
+dependencies[] = shortcut
+
+files[] = uw_base_profile.profile
--- a/uw_base_profile.install
+++ b/uw_base_profile.install
+<?php
+// $Id: uWaterloo Base
+
+/**
+ * Implements hook_install().
+ *
+ * Perform actions to set up the site for this profile.
+ */
+function uw_base_profile_install() {
+
+  // Enable some standard blocks.
+  $default_theme = variable_get('theme_default', 'bartik');
+  $admin_theme = 'seven';
+  $values = array(
+    array(
+      'module' => 'system',
+      'delta' => 'main',
+      'theme' => $default_theme,
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'content',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'system',
+      'delta' => 'help',
+      'theme' => $default_theme,
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'help',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'system',
+      'delta' => 'main',
+      'theme' => $admin_theme,
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'content',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'system',
+      'delta' => 'help',
+      'theme' => $admin_theme,
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'help',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'user',
+      'delta' => 'login',
+      'theme' => $admin_theme,
+      'status' => 1,
+      'weight' => 10,
+      'region' => 'content',
+      'pages' => '',
+      'cache' => -1,
+    ),
+  );
+  $query = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'pages', 'cache'));
+  foreach ($values as $record) {
+    $query->values($record);
+  }
+  $query->execute();
+
+  // Disable user picture support and set the default to a square thumbnail option in case it is enabled later.
+  variable_set('user_pictures', '0');
+  variable_set('user_picture_dimensions', '1024x1024');
+  variable_set('user_picture_file_size', '800');
+  variable_set('user_picture_style', 'thumbnail');
+
+  // Allow visitor account creation with administrative approval.
+  variable_set('user_register', USER_REGISTER_ADMINISTRATORS_ONLY);
+
+
+  // Create an image field named "Image", enabled for the 'article' content type.
+  // Many of the following values will be defaulted, they're included here as an illustrative examples.
+  // See http://api.drupal.org/api/function/field_create_field/7
+
+  $field = array(
+    'field_name' => 'field_image',
+    'type' => 'image',
+    'cardinality' => 1,
+    'translatable' => TRUE,
+    'locked' => FALSE,
+    'indexes' => array('fid' => array('fid')),
+    'settings' => array(
+      'uri_scheme' => 'public',
+      'default_image' => FALSE,
+    ),
+    'storage' => array(
+      'type' => 'field_sql_storage',
+      'settings' => array(),
+    ),
+  );
+  field_create_field($field);
+
+  // Get the admin role ID from the variable, if it doesn't exist yet we need to define it
+  $admin_role_id = variable_get('user_admin_role');
+
+  if (empty($admin_role_id)) {
+    // Create a default role for site administrators, with all available permissions assigned.
+    $admin_role = new stdClass();
+    $admin_role->name = 'administrator';
+    $admin_role->weight = 2;
+    user_role_save($admin_role);
+    user_role_grant_permissions($admin_role->rid, array_keys(module_invoke_all('permission')));
+    // Set this as the administrator role.
+    variable_set('user_admin_role', $admin_role->rid);
+    $admin_role_id = $admin_role->rid;
+  }
+
+  // Assign user 1 the "administrator" role.
+  db_insert('users_roles')
+    ->fields(array('uid' => 1, 'rid' => $admin_role_id))
+    ->execute();
+
+  // Create a Home link in the main menu.
+  $item = array(
+    'link_title' => st('Home'),
+    'link_path' => '<front>',
+    'menu_name' => 'main-menu',
+  );
+  menu_link_save($item);
+
+  // Update the menu router information.
+  menu_rebuild();
+
+  // Enable the admin theme.
+  db_update('system')
+    ->fields(array('status' => 1))
+    ->condition('type', 'theme')
+    ->condition('name', 'seven')
+    ->execute();
+  variable_set('node_admin_theme', '1');
+
+  // Set default theme to gateways
+  theme_enable(array('seven'));
+  variable_set('admin_theme', 'seven');
+  variable_set('node_admin_theme', '1');
+
+  // Set date-related variables.
+  variable_set('date_first_day', '1');
+  variable_set('date_api_use_iso8601', TRUE);
+  variable_set('date_format_long', 'l, F j, Y - H:i');
+  variable_set('date_format_medium', 'D, Y-m-d H:i');
+  variable_set('date_format_short', 'Y-m-d H:i');
+}
--- a/uw_base_profile.make
+++ b/uw_base_profile.make
--- a/uw_base_profile.profile
+++ b/uw_base_profile.profile
+<?php
+
+/*
+ * This function is called by form submit handlers to increase script execution time limits.
+ */
+function _uw_base_profile_max_execution_time() {
+  // Increase execution time for installs.
+  if ((int)ini_get('max_execution_time') < 240) {
+    set_time_limit(240);
+  }
+
+  // Make sure the MySQL does not die while scripts are executed.
+  if (db_driver() === 'mysql') {
+    db_query('SET SESSION wait_timeout = 240');
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Allows the profile to alter the site configuration form.
+ */
+function uw_base_profile_form_install_configure_form_alter(&$form, $form_state) {
+  // Pre-populate the site name with the server name.
+  $form['site_information']['site_name']['#default_value'] = $_SERVER['SERVER_NAME'];
+  // Pre-populate the country with "Canada".
+  $form['server_settings']['site_default_country']['#default_value'] = 'CA';
+  // Disable time zone autodetect and default to "America/Toronto".
+  $form['server_settings']['date_default_timezone']['#attributes']['class'][0] = '';
+  $form['server_settings']['date_default_timezone']['#default_value'] = 'America/Toronto';
+  // Disable email notifications by default.
+  $form['update_notifications']['update_status_module']['#default_value'][1] = 0;
+}
+
+
+
+/**
+ * Implements hook_install_tasks().
+ */
+function uw_base_profile_install_tasks() {
+  $tasks = array();
+  $tasks['uw_select_site_controller_form'] = array(
+    'display_name' => st('Site controller'),
+    'type' => 'form',
+  );
+  $tasks['uw_select_site_features_form'] = array(
+    'display_name' => st('Features'),
+    'type' => 'form',
+  );
+  $tasks['uw_create_default_content_form'] = array(
+    'display_name' => st('Create content'),
+    'type' => 'form',
+  );
+  return $tasks;
+}
+
+/**
+ * Task callback: returns the form allowing the user to select a site controller.
+ */
+function uw_select_site_controller_form() {
+  drupal_set_title(st('Optionally enable a site controller'));
+
+  $form['select_site_controller'] = array(
+    '#type' => 'radios',
+    '#title' => st('Please select a site configuration'),
+    '#options' => array('none' => st('None'), 'fdsu' => st('FDSU'), 'main' => st('Main')),
+    '#default_value' => 'none',
+  );
+
+  $form['actions'] = array('#type' => 'actions');
+  $form['submit'] = array('#type' => 'submit', '#value' => st('Enable and continue'));
+
+  return $form;
+}
+
+/**
+ * Submit callback: turns on a site controller
+ */
+function uw_select_site_controller_form_submit(&$form, &$form_state) {
+  _uw_base_profile_max_execution_time();
+
+  if ($form_state['values']['select_site_controller'] == 'fdsu') {
+    $success = module_enable(array('uw_site_fdsu'));
+  }
+
+  if ($form_state['values']['select_site_controller'] == 'main') {
+    $success = module_enable(array('uw_site_main'));
+  }
+
+  if (isset($success) && !$success) {
+    drupal_set_message('Could not enable site controller, a module dependency was missing -- the function module_enable() returned FALSE', 'error');
+  }
+
+}
+
+
+/**
+ * Task callback: returns the form allowing the user to turn on features at install time.
+ */
+function uw_select_site_features_form() {
+  drupal_set_title(st('Enable features'));
+
+  $form['enable_content_types'] = array(
+    '#type' => 'fieldset',
+    '#title' => st('Enable content types'),
+    '#collapsible' => FALSE,
+    '#tree' => TRUE,
+  );
+
+  // the array key is the name of the module
+  $form['enable_content_types']['uw_ct_contact'] = array(
+    '#type' => 'checkbox',
+    '#title' => st('Contacts'),
+  );
+   $form['enable_content_types']['uw_ct_custom_listing'] = array(
+    '#type' => 'checkbox',
+    '#title' => st('Custom listing page'),
+  );
+  $form['enable_content_types']['uw_ct_event'] = array(
+    '#type' => 'checkbox',
+    '#title' => st('Events'),
+  );
+/* Removing Feature Stories until the reqs are sorted out
+    $form['enable_content_types']['uw_ct_feature_story'] = array(
+    '#type' => 'checkbox',
+    '#title' => st('Feature stories'),
+  );
+*/