diff --git a/portail-citoyen2/static/portail_citoyen/css/style.css b/authentic2/static/portail_citoyen/css/style.css similarity index 100% rename from portail-citoyen2/static/portail_citoyen/css/style.css rename to authentic2/static/portail_citoyen/css/style.css diff --git a/portail-citoyen2/static/pratic2/Europe.png b/authentic2/static/pratic2/Europe.png similarity index 100% rename from portail-citoyen2/static/pratic2/Europe.png rename to authentic2/static/pratic2/Europe.png diff --git a/portail-citoyen2/static/pratic2/NPDC.png b/authentic2/static/pratic2/NPDC.png similarity index 100% rename from portail-citoyen2/static/pratic2/NPDC.png rename to authentic2/static/pratic2/NPDC.png diff --git a/portail-citoyen2/static/pratic2/RepFrancaise.png b/authentic2/static/pratic2/RepFrancaise.png similarity index 100% rename from portail-citoyen2/static/pratic2/RepFrancaise.png rename to authentic2/static/pratic2/RepFrancaise.png diff --git a/portail-citoyen2/static/pratic2/authentic-common.css b/authentic2/static/pratic2/authentic-common.css similarity index 100% rename from portail-citoyen2/static/pratic2/authentic-common.css rename to authentic2/static/pratic2/authentic-common.css diff --git a/authentic2/static/pratic2/authentic.css b/authentic2/static/pratic2/authentic.css deleted file mode 100644 index e31a8a1..0000000 --- a/authentic2/static/pratic2/authentic.css +++ /dev/null @@ -1,147 +0,0 @@ -@import url(/css/authentic-common.css); -body { - font-family: sans-serif; - margin: 0 auto; - padding: 0; - background: #eee; - color: black; - max-width: 50em; -} - -a { - color: #0072b8; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -#page { - border: 1px solid #0072b8; - border-width: 0px 2px; - background: white url(lockscreen.png) top right no-repeat; -} - -#top { - margin-top: 20px; - border-top: 2px solid #0072b8; - background: #52bce5 url(lockscreen.png) top right no-repeat; - padding-bottom: 1em; -} - -#top h1 { - margin: 1em 150px 0 10px; - text-align: right; - color: white; -} - -#content { - padding: 1em 2em 3em 2em; - position: relative; - /* background: url(lockscreen-bg.png) bottom right no-repeat; */ - background: url(path18223.png) 90% 0% no-repeat; -} - -p#breadcrumb { - margin: 0 150px 0 0; - font-size: 80%; - background: #d9dde8 url(deg.png) top right repeat-y; - padding: 0.5ex; -} - -#footer { - border-bottom: 2px solid #0072b8; - border-top: 1px solid #0072b8; - background: #28a5dc; - color: white; -} - -#footer p { - font-weight: bold; - margin: 0; - text-align: right; - font-size: smaller; - font-style: italic; - padding: 1ex 1em 2px 0; -} - - -p#forgot-password { - position: absolute; - right: 30px; - top: 60px; -} - -p#register { - position: absolute; - right: 30px; - top: 100px; -} - -p#cookies { - border: 1px solid #888; - background: #ccf url(admon-tip.png) 5px 5px no-repeat; - padding-left: 60px; - height: 60px; - line-height: 60px; -} - -ul { - list-style: circle; -} - -ul.FederationsWidget { - font-weight: bold; -} - -ul.FederationsWidget a.terminate { - font-weight: normal; - display: block; - margin-left: 5em; - margin-bottom: 1em; -} - -/* pratic stuff */ - -ul#services { - width: 65%; - float: left; -} - -p#commands { - clear: both; - border-top: 2px solid #0072b8; - padding-top: 1em; -} - -div#platform-status { - float: right; - width: 25%; - border: 2px solid #0072b8; - background: white; - background: rgba(255, 255, 255, 0.5); - -moz-border-radius: 5px; -} - -div#platform-status h3 { - background: #0072b8; - font-size: 100%; - text-align: center; - color: white; - margin: 0; -} - -div#platform-status div { - padding: 0 1ex; -} - -div#platform-status p#report-issue { - border-top: 2px solid #0072b8; - text-align: center; - margin: 0; -} - -dl.profile dd { - font-weight: bold; -} diff --git a/authentic2/static/pratic2/desc.xml b/authentic2/static/pratic2/desc.xml index f5be926..6094a1a 100644 --- a/authentic2/static/pratic2/desc.xml +++ b/authentic2/static/pratic2/desc.xml @@ -1,6 +1,6 @@ - - - Pr@tic Theme + + + New Pr@tic Theme Frederic Peters & artists diff --git a/portail-citoyen2/static/pratic2/imageFooter/Europe.png b/authentic2/static/pratic2/imageFooter/Europe.png similarity index 100% rename from portail-citoyen2/static/pratic2/imageFooter/Europe.png rename to authentic2/static/pratic2/imageFooter/Europe.png diff --git a/portail-citoyen2/static/pratic2/imageFooter/NPDC.png b/authentic2/static/pratic2/imageFooter/NPDC.png similarity index 100% rename from portail-citoyen2/static/pratic2/imageFooter/NPDC.png rename to authentic2/static/pratic2/imageFooter/NPDC.png diff --git a/portail-citoyen2/static/pratic2/imageFooter/RepFrancaise.png b/authentic2/static/pratic2/imageFooter/RepFrancaise.png similarity index 100% rename from portail-citoyen2/static/pratic2/imageFooter/RepFrancaise.png rename to authentic2/static/pratic2/imageFooter/RepFrancaise.png diff --git a/portail-citoyen2/static/pratic2/imageTop.png b/authentic2/static/pratic2/imageTop.png similarity index 100% rename from portail-citoyen2/static/pratic2/imageTop.png rename to authentic2/static/pratic2/imageTop.png diff --git a/portail-citoyen2/static/pratic2/info-mini.png b/authentic2/static/pratic2/info-mini.png similarity index 100% rename from portail-citoyen2/static/pratic2/info-mini.png rename to authentic2/static/pratic2/info-mini.png diff --git a/authentic2/static/pratic2/lock.svg b/authentic2/static/pratic2/lock.svg deleted file mode 100644 index 8ec5f28..0000000 --- a/authentic2/static/pratic2/lock.svg +++ /dev/null @@ -1,674 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/authentic2/static/pratic2/path18223.xcf b/authentic2/static/pratic2/path18223.xcf deleted file mode 100644 index 950ae4f..0000000 Binary files a/authentic2/static/pratic2/path18223.xcf and /dev/null differ diff --git a/portail-citoyen2/static/pratic2/portail-citoyen.css b/authentic2/static/pratic2/portail-citoyen.css similarity index 100% rename from portail-citoyen2/static/pratic2/portail-citoyen.css rename to authentic2/static/pratic2/portail-citoyen.css diff --git a/portail-citoyen2/static/pratic2/puce_btn.gif b/authentic2/static/pratic2/puce_btn.gif similarity index 100% rename from portail-citoyen2/static/pratic2/puce_btn.gif rename to authentic2/static/pratic2/puce_btn.gif diff --git a/portail-citoyen2/static/pratic2/style.css b/authentic2/static/pratic2/style.css similarity index 92% rename from portail-citoyen2/static/pratic2/style.css rename to authentic2/static/pratic2/style.css index c37b5dc..9fb8bb5 100644 --- a/portail-citoyen2/static/pratic2/style.css +++ b/authentic2/static/pratic2/style.css @@ -66,6 +66,7 @@ a:hover { padding: 1em 2em 3em 2em; position: relative; background:#FFFFFF url(lockscreen.png) top right no-repeat; + min-height: 300px; } ul#breadcrumb { @@ -95,6 +96,7 @@ ul#breadcrumb li:before { background: #d5dee3; height:60px; position:relative; + clear: both; } #footer p { @@ -167,18 +169,3 @@ p#cookies { line-height: 60px; display:none; } - -ul { - list-style: disc; -} - -ul.FederationsWidget { - font-weight: bold; -} - -ul.FederationsWidget a.terminate { - font-weight: normal; - display: block; - margin-left: 5em; - margin-bottom: 1em; -} diff --git a/portail-citoyen2/static/pratic2/template.ezt b/authentic2/static/pratic2/template.ezt similarity index 100% rename from portail-citoyen2/static/pratic2/template.ezt rename to authentic2/static/pratic2/template.ezt diff --git a/portail-citoyen2/static/pratic2/warning.png b/authentic2/static/pratic2/warning.png similarity index 100% rename from portail-citoyen2/static/pratic2/warning.png rename to authentic2/static/pratic2/warning.png diff --git a/portail-citoyen2/static/pratic2/admon-tip.png b/portail-citoyen2/static/pratic2/admon-tip.png deleted file mode 100644 index a25faae..0000000 Binary files a/portail-citoyen2/static/pratic2/admon-tip.png and /dev/null differ diff --git a/portail-citoyen2/static/pratic2/deg.png b/portail-citoyen2/static/pratic2/deg.png deleted file mode 100644 index ba0c89c..0000000 Binary files a/portail-citoyen2/static/pratic2/deg.png and /dev/null differ diff --git a/portail-citoyen2/static/pratic2/desc.xml b/portail-citoyen2/static/pratic2/desc.xml deleted file mode 100644 index 6094a1a..0000000 --- a/portail-citoyen2/static/pratic2/desc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - New Pr@tic Theme - Frederic Peters & artists - diff --git a/portail-citoyen2/static/pratic2/lockscreen-bg.png b/portail-citoyen2/static/pratic2/lockscreen-bg.png deleted file mode 100644 index a7758c9..0000000 Binary files a/portail-citoyen2/static/pratic2/lockscreen-bg.png and /dev/null differ diff --git a/portail-citoyen2/static/pratic2/lockscreen.png b/portail-citoyen2/static/pratic2/lockscreen.png deleted file mode 100644 index 7e0a9dc..0000000 Binary files a/portail-citoyen2/static/pratic2/lockscreen.png and /dev/null differ diff --git a/portail-citoyen2/static/pratic2/path18223.png b/portail-citoyen2/static/pratic2/path18223.png deleted file mode 100644 index 8a090cb..0000000 Binary files a/portail-citoyen2/static/pratic2/path18223.png and /dev/null differ diff --git a/portail-citoyen2/templates/base.html b/portail-citoyen2/templates/base.html deleted file mode 100644 index 618bb50..0000000 --- a/portail-citoyen2/templates/base.html +++ /dev/null @@ -1,109 +0,0 @@ - -{% load menu_tags cms_tags sekizai_tags i18n portail_citoyen_tags staticfiles %} - - - - - Compte Citoyen :: Démo :: {% page_attribute "page_title" %} - - - - {% render_block "css" %} - {% block extra_scripts %} - - {% endblock %} - - - {% cms_toolbar %} -
-
-

Pr@tic

- -
- {% block breadcrumb %} - - {% endblock %} -
- - {% block menu %} - - {% endblock %} - - {% block messages %} - {% if messages %} -
-
    - {% for message in messages %} - {{ message }} - {% endfor %} -
-
- {% endif %} - {% endblock %} - -
- {% block content %} - {% endblock %} -
-
- - -
- {% render_block "js" %} - {% if messages %} - - {% endif %} - - - diff --git a/portail-citoyen2/templates/base.new.html b/portail-citoyen2/templates/base.new.html deleted file mode 100644 index b06255f..0000000 --- a/portail-citoyen2/templates/base.new.html +++ /dev/null @@ -1,53 +0,0 @@ -{% load staticfiles i18n %} - - - - - - {% block title %}User test{% endblock %} - {{ openid_meta }} - {% block extra_scripts %} - {% endblock %} - - - -
-
-

Pr@tic

-
- - {% block breadcrumb %} - {% endblock %} - -
- {% if request.user.is_authenticated %} -
-

- {% blocktrans with request.user.get_full_name as username %}Hello {{ username }}.{% endblocktrans %} - {% trans "Logout" %}

-
- {% endif %} - {% block messages %} - {% if messages %} -
    - {% for message in messages %} - {{ message }} - {% endfor %} -
- {% endif %} - {% endblock %} - {% block content %}{% endblock %} -
- - - -
- - - diff --git a/portail-citoyen2/templates/base.old.html b/portail-citoyen2/templates/base.old.html deleted file mode 100644 index 15a1dd7..0000000 --- a/portail-citoyen2/templates/base.old.html +++ /dev/null @@ -1,100 +0,0 @@ - -{% load menu_tags cms_tags sekizai_tags i18n portail_citoyen_tags staticfiles %} - - - - - Compte Citoyen :: Démo :: {% page_attribute "page_title" %} - - {% render_block "css" %} - {% block extra_scripts %} - - {% endblock %} - - - {% cms_toolbar %} -
- -
-
- - {% block menu %} - - {% endblock %} - - {% block messages %} - {% if messages %} -
-
    - {% for message in messages %} - {{ message }} - {% endfor %} -
-
- {% endif %} - {% endblock %} - -
-
- {% block content %} - {% endblock %} -
-
-
- - - {% render_block "js" %} - {% if messages %} - - {% endif %} - - - diff --git a/portail-citoyen2/templates/blurps/demandes_en_cours.html b/portail-citoyen2/templates/blurps/demandes_en_cours.html deleted file mode 100644 index b034e81..0000000 --- a/portail-citoyen2/templates/blurps/demandes_en_cours.html +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/portail-citoyen2/templates/blurps/teleservices.html b/portail-citoyen2/templates/blurps/teleservices.html deleted file mode 100644 index 692953a..0000000 --- a/portail-citoyen2/templates/blurps/teleservices.html +++ /dev/null @@ -1,8 +0,0 @@ -
- -

Toutes les demandes

-
diff --git a/portail-citoyen2/templates/breadcrumb.html b/portail-citoyen2/templates/breadcrumb.html deleted file mode 100644 index 43d0a6d..0000000 --- a/portail-citoyen2/templates/breadcrumb.html +++ /dev/null @@ -1,9 +0,0 @@ -{% for ance in ancestors %} -
  • - {% if not forloop.last %} - {{ ance.get_menu_title }} - {% else %} - {{ ance.get_menu_title }} - {% endif %} -
  • -{% endfor %}