From 20787bee942714283ac1cd09a036e2dbd643fc35 Mon Sep 17 00:00:00 2001 From: Dae <elodie.bouziat@ensiie.fr> Date: Sun, 10 Dec 2017 21:14:32 +0100 Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20graphique,=20ajout=20de=20c?= =?UTF-8?q?ss=20sur=20les=20parties=20groupe=20et=20perso?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 572 ++++++++---------- Projet/polls/static/polls/style.css | 38 ++ .../polls/templates/polls/gestiongroupe.html | 29 +- .../polls/templates/polls/gestionperso.html | 24 +- 4 files changed, 328 insertions(+), 335 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index bd35bd2..c023d0c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,9 @@ <component name="ChangeListManager"> <list default="true" id="00a63665-454a-40e6-8b9f-7a09d949e062" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/static/polls/style.css" afterPath="$PROJECT_DIR$/Projet/polls/static/polls/style.css" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html" afterPath="$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html" afterPath="$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -12,66 +14,55 @@ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="views.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/views.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="202"> - <caret line="150" column="13" lean-forward="false" selection-start-line="150" selection-start-column="13" selection-end-line="150" selection-end-column="13" /> - <folding> - <element signature="e#24#63#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="settings.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/settings.py"> + <file leaf-file-name="inscription.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="18"> + <caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="17" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="inscription.html" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html"> + <file leaf-file-name="forms.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="216"> - <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" /> - <folding /> + <state relative-caret-position="594"> + <caret line="33" column="56" lean-forward="false" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" /> + <folding> + <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/index.html"> + <file leaf-file-name="connexion.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="306"> - <caret line="17" column="5" lean-forward="false" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" /> + <state relative-caret-position="108"> + <caret line="6" column="7" lean-forward="false" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="forms.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py"> + <file leaf-file-name="gestiongroupe.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="558"> - <caret line="31" column="44" lean-forward="false" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" /> + <state relative-caret-position="563"> + <caret line="32" column="47" lean-forward="false" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="connexion.html" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html"> + <file leaf-file-name="gestionperso.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="252"> - <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" /> + <state relative-caret-position="414"> + <caret line="23" column="45" lean-forward="false" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" /> <folding /> </state> </provider> @@ -80,8 +71,8 @@ <file leaf-file-name="urls.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/Projet/polls/urls.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="486"> - <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" /> + <state relative-caret-position="198"> + <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> <folding> <element signature="e#0#32#0" expanded="true" /> </folding> @@ -89,33 +80,21 @@ </provider> </entry> </file> - <file leaf-file-name="report.html" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="576"> - <caret line="191" column="10" lean-forward="false" selection-start-line="191" selection-start-column="10" selection-end-line="191" selection-end-column="10" /> - <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="models.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/models.py"> + <file leaf-file-name="style.css" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/Projet/polls/static/polls/style.css"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="252"> - <caret line="14" column="31" lean-forward="false" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" /> + <state relative-caret-position="560"> + <caret line="61" column="23" lean-forward="false" selection-start-line="61" selection-start-column="23" selection-end-line="61" selection-end-column="23" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="tests.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Projet/polls/tests.py"> + <file leaf-file-name="eleve.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="216"> + <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="15" selection-end-column="4" /> <folding /> </state> </provider> @@ -146,14 +125,23 @@ <option value="$PROJECT_DIR$/Projet/polls/views.py" /> <option value="$PROJECT_DIR$/Projet/polls/urls.py" /> <option value="$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html" /> + <option value="$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html" /> + <option value="$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html" /> + <option value="$PROJECT_DIR$/Projet/polls/static/polls/style.css" /> </list> </option> </component> - <component name="ProjectFrameBounds"> - <option name="x" value="64" /> - <option name="y" value="-11" /> + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> + <component name="JsGulpfileManager"> + <detection-done>true</detection-done> + <sorting>DEFINITION_ORDER</sorting> + </component> + <component name="ProjectFrameBounds" extendedState="6"> + <option name="x" value="273" /> + <option name="y" value="120" /> <option name="width" value="1303" /> - <option name="height" value="780" /> + <option name="height" value="772" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> @@ -171,168 +159,79 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="polls" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="polls" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="templates" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="polls" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="templates" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="polls" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="polls" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="static" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="polls" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="migrations" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Projet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ChandelIIEr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> + <expand> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + <item name="static" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + <item name="static" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + <item name="templates" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> + <item name="Projet" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + <item name="templates" type="462c0819:PsiDirectoryNode" /> + <item name="polls" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> </subPane> </pane> + <pane id="Scope" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> <property name="DefaultHtmlFileTemplate" value="HTML File" /> + <property name="WebServerToolWindowFactoryState" value="false" /> + </component> + <component name="RecentsManager"> + <key name="MoveFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/Projet/polls/templates/polls" /> + </key> + <key name="CopyFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/Projet/polls/static/polls" /> + </key> </component> <component name="RunDashboard"> <option name="ruleStates"> @@ -426,19 +325,20 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="64" y="-11" width="1303" height="780" extended-state="6" /> + <frame x="65" y="-4" width="1535" height="904" extended-state="6" /> <editor active="true" /> <layout> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24980783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2495114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -448,6 +348,30 @@ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> + <layout-to-restore> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> + <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24980783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + </layout-to-restore> + </component> + <component name="TypeScriptGeneratedFilesManager"> + <option name="version" value="1" /> </component> <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> @@ -457,62 +381,12 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/Projet/polls/views.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="108"> - <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" /> - <folding> - <element signature="e#24#63#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/index.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="90"> - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/urls.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="72"> - <caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" /> - <folding> - <element signature="e#0#32#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/urls.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="252"> - <caret line="14" column="3" lean-forward="false" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/models.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="126"> - <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="126"> <caret line="7" column="16" lean-forward="false" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" /> <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> + <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." /> </folding> </state> </provider> @@ -521,9 +395,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="108"> <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" /> - <folding> - <element signature="e#24#63#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -531,7 +402,9 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="378"> <caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" /> - <folding /> + <folding> + <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." /> + </folding> </state> </provider> </entry> @@ -563,7 +436,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="126"> <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -572,7 +444,7 @@ <state relative-caret-position="198"> <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" /> <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> + <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." /> </folding> </state> </provider> @@ -581,9 +453,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="144"> <caret line="15" column="10" lean-forward="false" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" /> - <folding> - <element signature="e#24#63#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -592,7 +461,7 @@ <state relative-caret-position="54"> <caret line="3" column="6" lean-forward="false" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" /> <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> + <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." /> </folding> </state> </provider> @@ -601,7 +470,9 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="54"> <caret line="3" column="66" lean-forward="false" selection-start-line="3" selection-start-column="66" selection-end-line="3" selection-end-column="66" /> - <folding /> + <folding> + <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." /> + </folding> </state> </provider> </entry> @@ -623,7 +494,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="126"> <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -641,7 +511,9 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="108"> <caret line="6" column="29" lean-forward="false" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" /> - <folding /> + <folding> + <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." /> + </folding> </state> </provider> </entry> @@ -657,7 +529,7 @@ <state relative-caret-position="180"> <caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" /> <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> + <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." /> </folding> </state> </provider> @@ -683,7 +555,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="126"> <caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -691,9 +562,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="504"> <caret line="36" column="0" lean-forward="true" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" /> - <folding> - <element signature="e#24#63#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -701,7 +569,9 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="54"> <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" /> - <folding /> + <folding> + <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." /> + </folding> </state> </provider> </entry> @@ -717,7 +587,7 @@ <state relative-caret-position="162"> <caret line="9" column="14" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="14" /> <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> + <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." /> </folding> </state> </provider> @@ -736,7 +606,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -744,9 +613,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="234"> <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> - <folding> - <element signature="e#24#63#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -757,130 +623,174 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/bdd.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/admin.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/bdd.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/tests.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/admin.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/apps.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/tests.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/models.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="252"> + <caret line="14" column="31" lean-forward="false" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/visualisation.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/apps.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="594"> + <caret line="33" column="56" lean-forward="false" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" /> + <folding> + <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/settings.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/models.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/views.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="252"> - <caret line="14" column="31" lean-forward="false" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" /> + <state relative-caret-position="202"> + <caret line="150" column="13" lean-forward="false" selection-start-line="150" selection-start-column="13" selection-end-line="150" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/index.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="306"> + <caret line="17" column="5" lean-forward="false" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" /> + </state> + </provider> + </entry> + <entry file="jar://$APPLICATION_HOME_DIR$/lib/pycharm.jar!/resources/html5-schema/html5/web-forms2.rnc"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="11052"> + <caret line="614" column="22" lean-forward="false" selection-start-line="614" selection-start-column="22" selection-end-line="614" selection-end-column="22" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/visualisation.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/static/polls/read_md.js"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="n#!!doc" expanded="false" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/prof.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="558"> - <caret line="31" column="44" lean-forward="false" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" /> + <state relative-caret-position="342"> + <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/groupe_default.jpg"> + <provider selected="true" editor-type-id="images"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="576"> - <caret line="191" column="10" lean-forward="false" selection-start-line="191" selection-start-column="10" selection-end-line="191" selection-end-column="10" /> - <folding> - <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." /> - </folding> + <state relative-caret-position="216"> + <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="15" selection-end-column="4" /> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Projet/polls/urls.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="486"> - <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" /> + <state relative-caret-position="198"> + <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> <folding> <element signature="e#0#32#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/settings.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="414"> + <caret line="23" column="45" lean-forward="false" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/views.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="202"> - <caret line="150" column="13" lean-forward="false" selection-start-line="150" selection-start-column="13" selection-end-line="150" selection-end-column="13" /> + <state relative-caret-position="194"> + <caret line="15" column="18" lean-forward="false" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" /> <folding> - <element signature="e#24#63#0" expanded="true" /> + <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="18"> + <caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="252"> - <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" /> + <state relative-caret-position="108"> + <caret line="6" column="7" lean-forward="false" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="216"> - <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" /> + <state relative-caret-position="563"> + <caret line="32" column="47" lean-forward="false" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/index.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/static/polls/style.css"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="306"> - <caret line="17" column="5" lean-forward="false" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" /> + <state relative-caret-position="560"> + <caret line="61" column="23" lean-forward="false" selection-start-line="61" selection-start-column="23" selection-end-line="61" selection-end-column="23" /> <folding /> </state> </provider> diff --git a/Projet/polls/static/polls/style.css b/Projet/polls/static/polls/style.css index ce9afbc..6bf5634 100644 --- a/Projet/polls/static/polls/style.css +++ b/Projet/polls/static/polls/style.css @@ -33,6 +33,8 @@ body { background-color: royalblue; width: 15%; height: 100%; + opacity: 0.8; + filter: alpha(opacity=80); /* For IE8 and earlier */ } .ul-left-menu{ @@ -46,6 +48,7 @@ body { padding-bottom: 3px; padding-top: 3px; padding-left: 20px; + padding-right: 20px; list-style-type: none; text-align: left; color: white; @@ -358,3 +361,38 @@ input[type=password], select { text-decoration: none; color: royalblue; } + +/* groupe */ + +.right-groupe-title{ + color: blue; + -webkit-border-radius: 25px; + -moz-border-radius: 25px; + border-radius: 25px; + padding: 25px; + font-family: "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif; + background-color: white; + text-align: center; +} + +.right-groupe-icone{ + -webkit-border-radius:25px; + -moz-border-radius:25px; + border-radius:25px; + width:30%; + background: white; + border-color: lightblue; + border-width: 5px; + border-style: solid; + margin: 10px; + font-family: "Ubuntu Beta", "Bitstream Vera Sans", DejaVu Sans, Tahoma, sans-serif; + text-align: center; + font-size: larger; + padding : 10px; +} + +.right-groupe-icone:hover{ + border-color: blue; +} + + diff --git a/Projet/polls/templates/polls/gestiongroupe.html b/Projet/polls/templates/polls/gestiongroupe.html index 4957457..fb08113 100644 --- a/Projet/polls/templates/polls/gestiongroupe.html +++ b/Projet/polls/templates/polls/gestiongroupe.html @@ -1,10 +1,37 @@ <!DOCTYPE html> +{% load static %} <html lang="fr"> <head> <meta charset="UTF-8"> <title>Groupe</title> </head> +<link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}" /> <body> -Il faudra mettre la gestion des groupe ici +<span> + <div class="left-menu"> + <h1 class="title-menu">Menu :</h1> + <ul class="ul-left-menu"> + <li><a href="/polls/visualisation">Voir les rapports</a></li> + <li><a href="/polls/report">Création de rapports</a></li> + <li><a href="/polls/gestiongroupe">Gestion du groupe</a></li> + <li><a href="/polls/gestionperso">Gestion perso</a></li> + </ul> + <li class="button-deconnexion"><a href="/polls/deconnexion">Déconnexion</a></li> + </div> + + {% csrf_token %} + <div class="right-report-block"> + <h1 class="right-groupe-title">Gestion de mes groupes</h1> + <h2 class="right-report-part2">Par défaut, affichage du groupe le plus récent</h2> + <div class="right-report-block2"> + Affichage des membres<br/> + Lien vers le dernier rapport<br/> + + Bouton ajouter/supprimer un membre<br/> + Bouton créer un nouveau rapport pour ce groupe<br/> + </div> + <h1 class="right-groupe-icone">Autre groupe</h1> + </div> + </span> </body> </html> \ No newline at end of file diff --git a/Projet/polls/templates/polls/gestionperso.html b/Projet/polls/templates/polls/gestionperso.html index 30c47b4..2f6170d 100644 --- a/Projet/polls/templates/polls/gestionperso.html +++ b/Projet/polls/templates/polls/gestionperso.html @@ -1,10 +1,28 @@ <!DOCTYPE html> -<html lang="en"> +{% load static %} +<html lang="fr"> <head> <meta charset="UTF-8"> - <title>Gestion Perso</title> + <title>Groupe</title> </head> +<link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}" /> <body> -Il faudra mettre la gestion perso ici +<span> + <div class="left-menu"> + <h1 class="title-menu">Menu :</h1> + <ul class="ul-left-menu"> + <li><a href="/polls/visualisation">Voir les rapports</a></li> + <li><a href="/polls/report">Création de rapports</a></li> + <li><a href="/polls/gestiongroupe">Gestion du groupe</a></li> + <li><a href="/polls/gestionperso">Gestion perso</a></li> + </ul> + <li class="button-deconnexion"><a href="/polls/deconnexion">Déconnexion</a></li> + </div> + + {% csrf_token %} + <div class="right-report-block"> + <h1 class="right-groupe-title">Mon compte</h1> + </div> + <span> </body> </html> \ No newline at end of file -- GitLab