Skip to content

Commit

Permalink
base-app demo
Browse files Browse the repository at this point in the history
  • Loading branch information
mruz committed Jul 12, 2014
1 parent dc0b275 commit 45d3bc5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

##### The base application in PhalconPHP
Use this application as a way to quick start any new project.
See working [base-app](http://mruz.pl/base-app), user/pass: user user, admin admin.
See working [base-app](http://base-app.mruz.pl), user/pass: user user, admin admin.
#####Migration to 2.0 in progress, demo may not work properly!
***
### Features:
Expand Down Expand Up @@ -46,7 +46,7 @@ See working [base-app](http://mruz.pl/base-app), user/pass: user user, admin adm
### Links:
* [Phalcon PHP](https://phalconphp.com)
* [Base-app](https://github.com/mruz/base-app)
* [Demo](http://mruz.pl/base-app)
* [Demo](http://base-app.mruz.pl)
* [Twitter Bootstrap](http://getbootstrap.com)

### Example volt usage:
Expand Down
14 changes: 7 additions & 7 deletions app/common/config/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
; @version 2.0
[app]
name = "base-app"
domain = "mruz.pl"
domain = "base-app.mruz.pl"
timezone = "Europe/London"
base_uri = "/base-app/"
static_uri = "http://mruz.pl/base-app/"
base_uri = "/"
static_uri = "http://base-app.mruz.pl/"
env = "development" ;development|testing|staging|production
admin = "[email protected]"

[database]
host = "localhost"
username = "baseapp"
password = "baseapp"
dbname = "baseapp"
username = "demo"
password = "demo"
dbname = "demo_baseapp"

[auth]
hash_method = "sha256"
Expand Down Expand Up @@ -89,4 +89,4 @@ paypal[signature] = ""
paypal[env] = "live"
paypal[apiVersion] = 63.0
paypal[returnURL] = "payment/return/paypal"
paypal[cancelURL] = "payment/cancel/paypal"
paypal[cancelURL] = "payment/cancel/paypal"
2 changes: 1 addition & 1 deletion app/documentation/views/index/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
### Links:
* [Phalcon PHP](https://phalconphp.com)
* [Base-app](https://github.com/mruz/base-app)
* [Demo](http://mruz.pl/base-app)
* [Demo](http://base-app.mruz.pl)
* [Twitter Bootstrap](http://getbootstrap.com)

### Example volt usage:
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/views/index/index.volt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{# Home View | base-app | 2.0 #}
<h1>base-app 2.0</h1>
<h5>{{ __('The base application in PhalconPHP') }}</h5>
<p>{{ __('Use this application as a way to quick start any new project.') }} {{ __('See working :link, user/pass: :users.', [':link' : '<a href="http://mruz.pl/base-app">base-app</a>', ':users' : 'user user, admin admin']) }}</p>
<p>{{ __('Use this application as a way to quick start any new project.') }} {{ __('See working :link, user/pass: :users.', [':link' : '<a href="http://base-app.mruz.pl">base-app</a>', ':users' : 'user user, admin admin']) }}</p>
<hr />
<p>{{ linkTo('doc', __('Documentation')) }}</p>

0 comments on commit 45d3bc5

Please sign in to comment.