# HG changeset patch # User Gautier Thibault # Date 1269441778 -3600 # Node ID 9a7dd07eeae6b741bd87adc3161acc3fc044f788 # Parent 8a048c4acbdac6255191b01c83043666e5955197 add UserLogin diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/config/routing.yml --- a/web/thdProject/apps/frontend/config/routing.yml Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/apps/frontend/config/routing.yml Wed Mar 24 15:42:58 2010 +0100 @@ -3,6 +3,17 @@ url: / param: { module: homepage, action: index } +loginUser: + url: /connexion + param: { module: account, action: loginUser} + +logoutUser: + url: /deconnexion + param: { module: account, action: logoutUser} + +registerUser: + url: /inscription + param: { module: account, action: registerUser} ######## diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/account/actions/actions.class.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/modules/account/actions/actions.class.php Wed Mar 24 15:42:58 2010 +0100 @@ -0,0 +1,22 @@ +forward('account', 'viewUser'); + } +} \ No newline at end of file diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/account/actions/components.class.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/modules/account/actions/components.class.php Wed Mar 24 15:42:58 2010 +0100 @@ -0,0 +1,7 @@ +" method="post" action=""> + hasFlash('login_error')): ?> +
+ Votre email et/ou votre mot de passe sont incorrects. +
+ Vérifiez vos informations de connexion et connectez-vous à nouveau. +
+ +
+ + +
+ +
+ + +
+ + + +
+ +
+ diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/account/templates/_loginUserFormHeader.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/modules/account/templates/_loginUserFormHeader.php Wed Mar 24 15:42:58 2010 +0100 @@ -0,0 +1,27 @@ +
+ Déja inscrit ? connectez-vous + hasFlash('login_error')): ?> +
+ Votre email et/ou votre mot de passe sont incorrects. +
+ +
+ + +
+ +
+ + +
+ + + + +
+ +
+
+
+ Créer mon compte +
diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php --- a/web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/apps/frontend/modules/homepage/templates/_lastTaggedList.php Wed Mar 24 15:42:58 2010 +0100 @@ -13,7 +13,7 @@ $video_file = $item->getVideos(); ?>
  • -
    ') no-repeat;" href=""> +
    ') no-repeat;" href="">
    De getDirectors(), 'name'); ?>
    diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/partials/actions/actions.class.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/modules/partials/actions/actions.class.php Wed Mar 24 15:42:58 2010 +0100 @@ -0,0 +1,22 @@ +forward('default', 'module'); + } +} diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/partials/actions/components.class.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/modules/partials/actions/components.class.php Wed Mar 24 15:42:58 2010 +0100 @@ -0,0 +1,10 @@ + +

    UniversCiné

    -
    avec le concours de iri | Sony CSL | Cap Digital
    +
    avec le concours de iri | Sony CSL | Cap Digital
    le site du cinéma indépendant
    diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/partials/templates/_navigation.php --- a/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/apps/frontend/modules/partials/templates/_navigation.php Wed Mar 24 15:42:58 2010 +0100 @@ -7,6 +7,6 @@
  • Top des films taggés
  • Aide
  • Qui sommes-nous ?
  • - + \ No newline at end of file diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php Wed Mar 24 15:42:58 2010 +0100 @@ -0,0 +1,11 @@ +
    +
    + + +
    + +
    \ No newline at end of file diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/apps/frontend/templates/layout.php --- a/web/thdProject/apps/frontend/templates/layout.php Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/apps/frontend/templates/layout.php Wed Mar 24 15:42:58 2010 +0100 @@ -10,6 +10,7 @@
    diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/cache/.keepme diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/lib/helper/ThdHtmlHelper.php --- a/web/thdProject/lib/helper/ThdHtmlHelper.php Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/lib/helper/ThdHtmlHelper.php Wed Mar 24 15:42:58 2010 +0100 @@ -51,4 +51,14 @@ function video_path($source) { return sfConfig::get('app_video_root_uri').'/'.$source; +} + +/** + * Helper wich generate submit button + * [label] = displayed text + * + * @param string $label + */ +function uc_render_submit_button($label) { + return ''; } \ No newline at end of file diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/web/css/base.css --- a/web/thdProject/web/css/base.css Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/web/css/base.css Wed Mar 24 15:42:58 2010 +0100 @@ -33,7 +33,9 @@ /* Links */ a:link, a:visited { - color: #990000; + color: #FFFFFF; + font-weight: bold; + font size: 14px; text-decoration:none; } a:hover { @@ -44,8 +46,8 @@ } a.button { - display: inline-block; - padding: 5px 20px 0px 20px; + display: inline-block; + padding: 5px 20px 0px 20px; height: 17px; overflow: hidden; font-size: 10px; @@ -230,4 +232,185 @@ ul.tag-list li.tag-score-5 a { font-size: 20px; color: #FFFFFF; +} + + + +.table-form .form-description { + color: #777777; + margin-left: 7px; + font-size: 11px; + font-weight: bold; +} + +.table-form .form-description .required { + color: #990000; +} + +.table-form .form-error { + padding: 10px 10px 10px 40px; + margin: 5px 0; + color: #ffffff; + background: #990000 url("/images/pictos/error.png") no-repeat 5px 10px; +} + +.table-form fieldset { + display: block; + padding: 10px 0; + border: none; +} + +.table-form .field { + clear: both; + width: 100%; + float: left; + padding: 2px 0px; +} + +.table-form .field label { + display: block; + float: left; + margin-left: 7px; + margin-right: 7px; + color: #777777; + font-weight: bold; + padding-top: 4px; +} + +.table-form .field input, +.table-form .field select, +.table-form .field .input-date, +.table-form .field ul.radio_list { + display: block; + float: right; + margin-right: 7px; +} + +.table-form .field .input-date select { + display: inline-block; + float: none; + width: auto; + margin: 0px; +} + +.table-form .field ul.radio_list { + list-style: none; +} + +.table-form .field ul.radio_list label, +.table-form .field ul.radio_list input, +.table-form .field ul.radio_list li { + display: inline; + padding: 0px; + margin: 0px; + float: none; + text-align: right; + line-height: 23px; + width: auto; +} + +.table-form .field ul.radio_list li { + padding-left: 10px; +} + +.table-form .field ul.radio_list input { + vertical-align: middle; +} + +.table-form .field label .required { + color: #990000; + vertical-align: middle; + padding-left: 5px; +} + +.table-form .field-type-file input { + height: 22px; +} + +.table-form .field-type-file ul { + list-style: none; + float: right; + margin-right: 7px; +} + +.table-form .field-type-file li { + display: block; + padding-bottom: 5px; + clear: both; +} + +.table-form .field-type-file li label, +.table-form .field-type-file li input { + display: inline; + float: none; + padding-top: 2px; + margin-left: 2px; + vertical-align: middle; +} + +.table-form .field-type-file input { + clear: right; +} + +.table-form .field-type-checkbox label { + float: left; + margin: 0 7px 0 7px; +} + +.table-form .field-type-checkbox input { + float: left; + border: none; + padding: 0; + margin: 4px 0 0 8px; + background: transparent !important; +} + +.table-form .field-type-captcha div { + clear: right; + float: right; +} + +.table-form .field-type-captcha div a { + padding-right: 10px; +} + +.table-form .field-type-captcha div input { + margin-top: 10px; +} + +.table-form .buttons { + clear: both; + padding: 6px 0 0 0; + text-align: center; +} + +.table-form .field-error { + background: #990000; + margin: 5px 0; + padding: 5px 0; +} + +.table-form .field-error label, +.table-form .field-error label .required { + color: #ffffff; +} + + +.table-form .field-error input { + background: #ffcccc; +} + +.table-form ul.error-list { + clear: both; + display: block; + list-style: none; + margin: 0; + padding: 5px 0; + width: 100%; + color: #ffffff; +} + +.table-form ul.error-list li { + display: block; + padding: 5px 10px 5px 50px; } \ No newline at end of file diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/web/css/layout.css --- a/web/thdProject/web/css/layout.css Wed Mar 24 14:54:32 2010 +0100 +++ b/web/thdProject/web/css/layout.css Wed Mar 24 15:42:58 2010 +0100 @@ -13,7 +13,7 @@ /* HEADER ===================== */ #header { position: relative; - width: 100%; + width: 1200px; height: 120px; background: #000000; } @@ -58,6 +58,125 @@ font-family: Georgia, "Times New Roman", Times,serif; } +#header-user { + position: absolute; + top: 7px; + right: 0px; + width: 380px; + height: 240px; +} + +#header-user .main { + position: absolute; + top: 0px; + right: 0px; + width: 272px; +} + +#header-user .login, +#header-user .profile { + position: relative; + height: 117px; +} + +#header-user .register a { + display: block; + padding-right: 0px; + padding-left: 0px; + text-align: center; +} + +#header-user .login { + background: transparent url("../images/layout/bg_login.png") repeat-x; +} + +#header-user .login .head, +#header-user .login .error { + display: block; + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 16px; + line-height: 16px; + padding: 5px 5px 10px 7px; +} + +#header-user .login .head { + color: #EFEFEF; +} + +#header-user .login .error { + color: #ff0000; +} + +#header-user .login .buttons { + text-align: right; + padding: 5px 7px; +} + +#header-user .login label { + color: #ffffff; + text-transform: lowercase; +} + +#header-user .login .field input { + border: 0; +} + +#header-user .retrieve-password { + position: absolute; + top: 112px; + right: 120px; +} + +#header-user .retrieve-password a { + color: #ffffff; + font-weight: bold; +} + +#header-user .profile { + background: transparent url("/images/layout/bg_login.png") repeat-x; +} + +#header-user .display-name { + display: block; + text-align: right; +} + +#header-user .display-name span { + display: block; + padding: 2px 7px 0px 7px; + background: #990000; + color: #ffffff; + font-weight: bold; + font-size: 12px; + height: 20px; +} + +#header-user .profile .avatar, +#header-user .profile .community-list1 { + display: block; + position: absolute; + top: 15px; +} + +#header-user .profile .avatar { + left: 7px; +} + +#header-user .profile .community-list1 { + left: 60px; +} + +#header-user .profile .community-list1 a { + font-size: 11px; + color: #777777; +} + +#header-user .global-action-list { + position: absolute; + top: 55px; + left: 0px; +} + /* NAVIGATION====== */ #navigation { diff -r 8a048c4acbda -r 9a7dd07eeae6 web/thdProject/web/images/layout/bg_login.png Binary file web/thdProject/web/images/layout/bg_login.png has changed