diff --git a/CCF/app/controllers/AuthController.php b/CCF/app/controllers/AuthController.php index 695064e..0c7e755 100644 --- a/CCF/app/controllers/AuthController.php +++ b/CCF/app/controllers/AuthController.php @@ -24,7 +24,7 @@ public function action_sign_in() // theme this allows us to have a diffrent sign_in for every theme. // If the view does not exist in the theme it will load the view from // the default view folder. - $this->view = $this->theme->view( 'auth/sign_in' ); + $this->view = $this->theme->view( 'auth/sign_in.view' ); $this->view->last_identifier = CCIn::post( 'identifier' ); @@ -68,7 +68,7 @@ public function action_sign_up() } $this->theme->topic = __( ':action.topic' ); - $this->view = $this->theme->view( 'auth/sign_up' ); + $this->view = $this->theme->view( 'auth/sign_up.view' ); // create a new user object as data holder $user = new User; diff --git a/CCF/app/views/auth/sign_in.php b/CCF/app/views/auth/sign_in.php deleted file mode 100644 index 0697b0e..0000000 --- a/CCF/app/views/auth/sign_in.php +++ /dev/null @@ -1,49 +0,0 @@ - -
-
- -
-
-

-
-
- - - 'post', 'class' => 'form-horizontal' ) ); ?> - - -
- add_class( 'col-sm-2' ); ?> -
- placeholder( __( 'model/user.label.email' ) ); ?> -
-
- - -
- add_class( 'col-sm-2' ); ?> -
- placeholder( __( 'model/user.label.password' ) ); ?> -
-
- - -
-
- -
-
- - -
-
- - -
-
- - -
-
\ No newline at end of file diff --git a/CCF/app/views/auth/sign_in.view.php b/CCF/app/views/auth/sign_in.view.php new file mode 100644 index 0000000..928aacf --- /dev/null +++ b/CCF/app/views/auth/sign_in.view.php @@ -0,0 +1,48 @@ +{% use UI\Form; %} +
+
+ +
+
+

{{__( ':action.topic' )}}

+
+
+ + + {{ Form::start( 'sign-in', array( 'method' => 'post', 'class' => 'form-horizontal' ) ) }} + + +
+ {{ Form::label( 'identifier', __( 'model/user.label.email' ) )->add_class( 'col-sm-2' ) }} +
+ {{ Form::input( 'identifier', $last_identifier ) + ->placeholder( __( 'model/user.label.email' ) ) }} +
+
+ + +
+ {{ Form::label( 'password', __( 'model/user.label.password' ) )->add_class( 'col-sm-2' ) }} +
+ {{ Form::input( 'password', null, 'password' ) + ->placeholder( __( 'model/user.label.password' ) ) }} +
+
+ + +
+
+ {{ Form::checkbox( 'retain', __( 'model/user.label.retain' ), true ) }} +
+
+ + +
+
+ +
+
+ + {{ Form::end(); }} +
+
\ No newline at end of file diff --git a/CCF/app/views/auth/sign_up.php b/CCF/app/views/auth/sign_up.php deleted file mode 100644 index d0611cc..0000000 --- a/CCF/app/views/auth/sign_up.php +++ /dev/null @@ -1,50 +0,0 @@ - -
-
- -
-
-

-
-
- - - 'post', 'class' => 'form-horizontal' ) ); ?> - - -
- add_class( 'col-sm-2' ); ?> -
- email, 'email' ) - ->placeholder( __( 'model/user.label.email' ) ); ?> -
-
- - -
- add_class( 'col-sm-2' ); ?> -
- placeholder( __( 'model/user.label.password' ) ); ?> -
-
- - -
- add_class( 'col-sm-2' ); ?> -
- placeholder( __( 'model/user.label.password_match' ) ); ?> -
-
- - -
-
- -
-
- - -
-
\ No newline at end of file diff --git a/CCF/app/views/auth/sign_up.view.php b/CCF/app/views/auth/sign_up.view.php new file mode 100644 index 0000000..fc861df --- /dev/null +++ b/CCF/app/views/auth/sign_up.view.php @@ -0,0 +1,50 @@ +{% use UI\Form; %} +
+
+ +
+
+

{{__( ':action.topic' )}}

+
+
+ + + {{ Form::start( 'sign-in', array( 'method' => 'post', 'class' => 'form-horizontal' ) ) }} + + +
+ {{ Form::label( 'email', __( 'model/user.label.email' ) )->add_class( 'col-sm-2' ); }} +
+ {{ Form::input( 'email', $user->email, 'email' ) + ->placeholder( __( 'model/user.label.email' ) ); }} +
+
+ + +
+ {{ Form::label( 'password', __( 'model/user.label.password' ) )->add_class( 'col-sm-2' ); }} +
+ {{ Form::input( 'password', null, 'password' ) + ->placeholder( __( 'model/user.label.password' ) ); }} +
+
+ + +
+ {{ Form::label( 'password_match', __( 'model/user.label.password_match' ) )->add_class( 'col-sm-2' ); }} +
+ {{ Form::input( 'password_match', null, 'password' ) + ->placeholder( __( 'model/user.label.password_match' ) ); }} +
+
+ + +
+
+ +
+
+ + {{ Form::end() }} +
+
\ No newline at end of file diff --git a/CCF/app/views/welcome.php b/CCF/app/views/welcome.php index a2ab5d6..e326c69 100755 --- a/CCF/app/views/welcome.php +++ b/CCF/app/views/welcome.php @@ -3,4 +3,4 @@
Environment: -
+
\ No newline at end of file diff --git a/README.md b/README.md index 85acdfc..d7fff22 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ClanCats Framework 2.0 [![Downloads](http://img.shields.io/packagist/dm/clancats/core.svg)](https://github.com/ClanCats/Framework) -ClanCats Framework, because your time is precious. HMVC PHP framework. +ClanCatsFramework, because your time is precious. HMVC PHP framework. _This is the Application repository if you like to contribute take a look at the core repository:_ https://github.com/ClanCats/Core