Merge branch 'webroot'

Author: charlesportwoodii

.gitignore

@@ -1,6 +1,7 @@
 .AppleDouble
 public_html
 /assets/*
+/web/assets/*
 /vendor/*
 /themes/*
 /protected/runtime/*
@@ -10,6 +11,7 @@ public_html
 !/themes/default
 /protected/modules/*
 /uploads/*
+/web/uploads/*
 .htaccess
 *.*~
 *.swp

.travis.yml

@@ -4,6 +4,7 @@ env:
   global:
     - "ARTIFACTS_AWS_REGION=us-east-1"
     - "ARTIFACTS_S3_BUCKET=travis-s3-us-01"
+    - "ARTIFACTS_DEBUG=1"
     - secure: "ZhvRET5CEgYtZY5z8nUDjcpqthkVb6yc/qBi/re+EOaLgx1nVFSf5G6uHEVqlzNka5F67KT+kV0Ph3WqoT9d3X10IAiH2cdvG/gsZxJi8pXn+A0A1f9I4wnsvlSDmgHG46JjWb7nz6VqKb5WC54eVEEZ2kPlkQPmXZ5r9QbanCs="
     - secure: "ioXW769alaD/b2QrPyzRgRV/k/7p5TmtuRDKQmLFa5wcAkLiuWa6VzaMMdc5VroK4hEsMvJdxJJtrneZEyPluiVntL59TW5OO5OzDVrxZInlXRLCW1jSwi2BkzdezNfS5g6X3nv3d/YOz4pci/KbLmiDVwOt+LWEjymOqLarVpA="
     - secure: "U9q/v5DwZtVmRYjczFWIu49AP1RDBvWZasj+cqE+qUN+z8k7F+WvFlpoBfguKyT4utxlQCeu/2cUxz3v++Ab3mjdgtAumtqSZVcklNPduah2wiXyg4jz65FLemgRSlWTGDFsc5EcIBwk4OUZFdguikiAJGVtiY5VTfv/0kW5P1w="
@@ -28,7 +29,7 @@ notifications:
   email:
     on_success: change
     on_failure: change
-    
+
 install:
   - bundle install --path vendor/bundler
   - composer config --global github-oauth.github.com $GITHUB_API_TOKEN
@@ -37,10 +38,15 @@ install:
   - php -i
 
 before_script:
-  - mysql -e 'create database ciims_travis;'
-  - php index.php installer index --dbHost=127.0.0.1 --dbName=ciims_travis --dbUsername=root --dbPassword="" --adminEmail="travis@ciims.io" --adminPassword=travis --adminUsername=travis --siteName="CiiMS - Travis CI" --force=0 --writeConfig=1 --debug=1
+  - mysql -e 'CREATE DATABASE ciims_travis;'
+  - php web/index.php installer index --dbHost=127.0.0.1 --dbName=ciims_travis --dbUsername=root --dbPassword="" --adminEmail="travis@ciims.io" --adminPassword=travis --adminUsername=travis --siteName="CiiMS - Travis CI" --force=0 --writeConfig=1 --debug=1
 
 after_failure: # Upload the application.log on failure
   - "bundle exec travis-artifacts upload --path protected/runtime/application.log"
 
-script: ./vendor/bin/codecept run
+script: 
+  - ./vendor/bin/codecept run
+  - ./vendor/bin/codecept run -c ./vendor/charlesportwoodii/cii
+  - ./vendor/bin/codecept run -c ./protected/modules/api
+  - ./vendor/bin/codecept run -c ./protected/modules/install
+  - ./vendor/bin/codecept run -c ./protected/modules/dashboard

codeception.yml

@@ -10,19 +10,13 @@ settings:
     memory_limit: 1024M
     log: true
 modules:
-    enabled: [PhpBrowser, WebHelper, TestHelper, Yii1, Db]
+    enabled: [PhpBrowser, WebHelper, TestHelper, Yii1]
     config:
         PhpBrowser:
             url: http://localhost:8234
         Yii1:
-            appPath: test.php
-            url: http://localhost:8234/test.php
-        Db:
-            dsn: 'mysql:host=127.0.0.1;dbname=ciims_travis'
-            user: 'root'
-            password: ''
-            populate: false
-            cleanup: false
+            appPath: web/test.php
+            url: http://localhost:8234/web/test.php
         curl:
             CURLOPT_SSL_VERIFYPEER: 0
             CURLOPT_SSL_VERIFYHOST: 0

composer.json

@@ -70,11 +70,11 @@
         "yiqing-95/YiiTimeAgo": "dev-master",
         "charlesportwoodii/eanalytics": "1.1.5",
         "charlesportwoodii/yii-newrelic": "1.0.1",
-        "charlesportwoodii/cii": "1.0.25",
+        "charlesportwoodii/cii": "1.0.26",
         "ciims-themes/default": "3.0.20",
-        "ciims-modules/dashboard": "3.0.26",
-        "ciims-modules/api": "2.0.22",
-        "ciims-modules/install": "2.0.12",
+        "ciims-modules/dashboard": "3.0.27",
+        "ciims-modules/api": "2.0.23",
+        "ciims-modules/install": "2.0.13",
         "ciims-modules/hybridauth": "2.0.6",
         "ciims-plugins/awsuploader": "1.0.3",
         "zhuravljov/yii2-debug": "v1.4",

composer.lock

@@ -54,6 +54,9 @@
 		),
 	),
 	'components' => array(
+		'themeManager' => array(
+			'basePath' => (__DIR__ . DS . '..' . DS . '..' . DS . 'themes')
+		),
 		'messages' => array(
 			'class' => 'vendor.charlesportwoodii.cii.components.CiiPHPMessageSource'
 		),

protected/config/main.default.php

@@ -234,7 +234,7 @@ public function beforeValidate()
         		$emailSettings->send(
 					$this,
 					Yii::t('ciims.models.Users', 'CiiMS Password Change Notification'),
-					'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.passwordchange',
+					'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.passwordchange',
 					array('user' => $this)
 				);
 			}

protected/models/Users.php

@@ -308,7 +308,7 @@ public function sendVerificationEmail()
         return $emailSettings->send(
 			$this->_user,
 			Yii::t('ciims.models.Users', 'CiiMS Email Change Notification'),
-			'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.email-change',
+			'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.email-change',
 			array(
 				'key' => $this->setNewEmailChangeKey(),
 				'user' => $this->_user