Skip to content

A
app
Commit 88383836 authored by Tobias Munk's avatar Tobias Munk
Browse files
Options

Merge branch 'master' of github.com:phundament/app 

Conflicts:
	composer.json
parents b485c604 99f9371d
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 162 deletions
README.md
View file @ 88383836
......@@ -2,10 +2,11 @@ Phundament 3 App
================
Get Phundament 3 - the Yii Application Foundation with CMS features via composer.
For more details visit http://phundament.com
For more details visit http://phundament.com.
Installation(*)
---------------
Installation
------------
Download and extract the installer as ZIP or TAR.GZ file from
......@@ -55,7 +56,6 @@ $config=dirname(__FILE__).'/protected/config/p3.php';
```
(*) Tested on Mac OS X (Linux)
Troubleshooting
......@@ -64,5 +64,15 @@ Troubleshooting
* Make sure you have git (http://git-scm.com/) and hg (http://mercurial.selenic.com/) installed
* zlib extension or unzip available on your PATH
* OpenSSL Support enabled in PHP or try ```--prefer-source```
* ```php -d allow_url_fopen=1 -d memory_limit=64M composer.phar update```
* Tested on Windows with WAMPSERVER 2.2 (PHP 5.3.10)
\ No newline at end of file
* ```php -d allow_url_fopen=1 -d memory_limit=64M composer.phar -v update```
* Tested on Windows with WAMPSERVER 2.2 (PHP 5.3.10)
Other Sources
-------------
If you're looking for a archive download of Phundament, visit: https://github.com/schmunk42/phundament/downloads
A git clone can be obtained with:
```
git clone --recursive https://github.com/schmunk42/phundament.git
```
\ No newline at end of file
composer.json
View file @ 88383836
......@@ -137,7 +137,17 @@
"type": "zip"
}
}
},{
},{
"type": "package",
"package": {
"name": "phundament/jquery-file-upload",
"version": "0.0.1",
"dist": {
"url": "https://nodeload.github.com/schmunk42/jQuery-File-Upload/zipball/5e08d974a080a931dda654086a1391e75cbda99f",
"type": "zip"
}
}
},{
"type": "package",
"package": {
"name": "yii",
......
protected/setup-p3.bat deleted 100644 → 0
View file @ b485c604
@echo off
echo ========================
echo Phundament 3 Quick Setup
echo ========================
echo
echo This script will do to following:
echo 1. if a valid yiic command is provided as first parameter, it will setup a Yii web application skeleton
echo 2. it will call Yii migration commands to setup the database schema
echo 3. it create appropriate folder permissions for P3Media the media manager module
echo
echo STAGE 1
echo Currently not available under Windows;
::if [ $1 != ]; then
:: echo For providing an out-of-the-box running web application, we had to modify 'config/main','config/console' and 'layouts/main'.
:: echo Note: Skip '...overwrite?' for these files by hitting <enter>
:: echo
:: pushd `dirname $1` > /dev/null
:: extYiicDir=`pwd`
:: popd > /dev/null
:: pushd `dirname $0`/.. > /dev/null
:: appDir=`pwd`
:: popd > /dev/null
:: echo Running command: $extYiicDir/yiic webapp $appDir
:: echo
:: $extYiicDir/yiic webapp $appDir
::else
:: echo External yiic command not specified, skipping webapp stage.;
::fi
::baseDir=`dirname $0`
::pushd $baseDir > /dev/null
echo
echo STAGE 2
SET /P ANSWER=Apply database migrations? (y/n)
echo You chose: %ANSWER%
if /i {%ANSWER%}=={y} (goto :yes2)
if /i {%ANSWER%}=={yes} (goto :yes2)
goto :no2
:yes2
echo You pressed yes!
echo Applying migrations...;
call yiic.bat migrate --migrationPath=ext.phundament.p3admin.modules-install.user.migrations --migrationTable=migration_module_user --interactive=0
call yiic.bat migrate --migrationPath=ext.phundament.p3admin.modules-install.rights.migrations --migrationTable=migration_module_rights --interactive=0
call yiic.bat migrate --migrationPath=ext.phundament.p3widgets.migrations --migrationTable=migration_module_p3widgets --interactive=0
call yiic.bat migrate --migrationPath=ext.phundament.p3media.migrations --migrationTable=migration_module_p3media --interactive=0
call yiic.bat migrate --migrationPath=ext.phundament.p3pages.migrations --migrationTable=migration_module_p3pages --interactive=0
:no2
echo
echo STAGE 3
SET /P ANSWER=Setup permissions? (y/n)
echo You chose: %ANSWER%
if /i {%ANSWER%}=={y} (goto :yes3)
if /i {%ANSWER%}=={yes} (goto :yes3)
goto :no3
:yes3
::read choice
::if [ $choice == y ]; then
mkdir ..\runtime
:: chmod 777 ../runtime
mkdir data\p3media
:: chmod 777 ./data/p3media
mkdir data\p3media-import
:: chmod 777 ./data/p3media-import
::else
:: echo Skipped.
::fi
:no3
echo
echo Installation complete.
echo Thank you for choosing Phundament 3.
exit /b 0
protected/setup-p3.sh deleted 100755 → 0
View file @ b485c604
#!/bin/bash
# Setup script for Phundament 3
#
# Since bash script is pretty cool and we haven't coded the PHP installer yet
echo "========================"
echo "Phundament 3 Quick Setup"
echo "========================"
echo ""
echo "This script will do to following:"
echo "1. if a valid yiic command is provided as first parameter, it will setup a Yii web application skeleton"
echo "2. it will call Yii migration commands to setup the database schema"
echo "3. it create appropriate folder permissions for P3Media the media manager module"
echo ""
echo "STAGE 1"
if [ "$1" != "" ]; then
echo "For providing an out-of-the-box running web application, we had to modify 'config/main','config/console' and 'layouts/main'."
echo "Note: Skip '...overwrite?' for these files by hitting <enter>"
echo ""
pushd `dirname $1` > /dev/null
extYiicDir="`pwd`"
popd > /dev/null
pushd "`dirname $0`/.." > /dev/null
appDir="`pwd`"
popd > /dev/null
echo "Running command: $extYiicDir/yiic webapp $appDir"
echo ""
$extYiicDir/yiic webapp $appDir
else
echo "External yiic command not specified, skipping webapp stage.";
fi
baseDir="`dirname $0`/../protected"
pushd $baseDir > /dev/null
echo ""
echo "STAGE 2"
echo "Apply database migrations? (y/n)";
read choice
if [ "$choice" == "y" ]; then
echo "Applying migrations...";
./yiic migrate --migrationPath=ext.phundament.p3admin.modules-install.user.migrations --migrationTable=migration_module_user --interactive=0
./yiic migrate --migrationPath=ext.phundament.p3admin.modules-install.rights.migrations --migrationTable=migration_module_rights --interactive=0
./yiic migrate --migrationPath=ext.phundament.p3widgets.migrations --migrationTable=migration_module_p3widgets --interactive=0
./yiic migrate --migrationPath=ext.phundament.p3media.migrations --migrationTable=migration_module_p3media --interactive=0
./yiic migrate --migrationPath=ext.phundament.p3pages.migrations --migrationTable=migration_module_p3pages --interactive=0
else
echo "Skipped."
fi
echo ""
echo "STAGE 3"
echo "Setup folder permissions? (y/n)";
read choice
if [ "$choice" == "y" ]; then
mkdir ../runtime
chmod 777 ../runtime
mkdir ./data/p3media
chmod 777 ./data/p3media
mkdir ./data/p3media-import
chmod 777 ./data/p3media-import
mkdir ./data/p3media-fs
chmod 777 ./data/p3media-fs
chmod 777 ./extensions/_themes/bootstrap/css
else
echo "Skipped."
fi
popd
echo ""
echo "Installation complete."
echo "Thank you for choosing Phundament 3."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment