Commit 03abe1dec11fdfa8dcf9a4e705b11fbc44d9e5b8
1 parent
f6917aaac7
Exists in
master
trabajando con el diseño del login
Showing
6 changed files
with
376 additions
and
85 deletions
Show diff stats
.idea/workspace.xml
@@ -2,13 +2,11 @@ | @@ -2,13 +2,11 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="5cb32f38-0c9f-4717-964b-38fbcbcb548a" name="Default" comment="Creado el formulario para enviar correo con bootstrap y validacion"> | 4 | <list default="true" id="5cb32f38-0c9f-4717-964b-38fbcbcb548a" name="Default" comment="Creado el formulario para enviar correo con bootstrap y validacion"> |
5 | - <change type="DELETED" beforePath="$PROJECT_DIR$/app/sessions/sess_86jfvdk9490d7f1h5m3efgubc1" afterPath="" /> | ||
6 | - <change type="DELETED" beforePath="$PROJECT_DIR$/app/sessions/sess_b7cg3j7u2h7vmm5hs6fpq885p6" afterPath="" /> | 5 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/web/assets/vendor/AppBundle/login.css" /> |
6 | + <change type="DELETED" beforePath="$PROJECT_DIR$/app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7" afterPath="" /> | ||
7 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | 7 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
8 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Resources/views/base.html.twig" afterPath="$PROJECT_DIR$/app/Resources/views/base.html.twig" /> | ||
8 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Resources/views/security/login.html.twig" afterPath="$PROJECT_DIR$/app/Resources/views/security/login.html.twig" /> | 9 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Resources/views/security/login.html.twig" afterPath="$PROJECT_DIR$/app/Resources/views/security/login.html.twig" /> |
9 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/AppBundle/Controller/RegistrationController.php" afterPath="$PROJECT_DIR$/src/AppBundle/Controller/RegistrationController.php" /> | ||
10 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php" afterPath="$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php" /> | ||
11 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/AppBundle/Entity/Usuarios.php" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/Usuarios.php" /> | ||
12 | </list> | 10 | </list> |
13 | <ignored path="sym_cea.iws" /> | 11 | <ignored path="sym_cea.iws" /> |
14 | <ignored path=".idea/workspace.xml" /> | 12 | <ignored path=".idea/workspace.xml" /> |
@@ -57,7 +55,7 @@ | @@ -57,7 +55,7 @@ | ||
57 | <file leaf-file-name="SecurityController.php" pinned="false" current-in-tab="false"> | 55 | <file leaf-file-name="SecurityController.php" pinned="false" current-in-tab="false"> |
58 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php"> | 56 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php"> |
59 | <provider selected="true" editor-type-id="text-editor"> | 57 | <provider selected="true" editor-type-id="text-editor"> |
60 | - <state vertical-scroll-proportion="-14.925926"> | 58 | + <state vertical-scroll-proportion="-22.666666"> |
61 | <caret line="41" column="25" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="25" /> | 59 | <caret line="41" column="25" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="25" /> |
62 | <folding> | 60 | <folding> |
63 | <element signature="e#1346#1353#1#PHP" expanded="true" /> | 61 | <element signature="e#1346#1353#1#PHP" expanded="true" /> |
@@ -67,13 +65,50 @@ | @@ -67,13 +65,50 @@ | ||
67 | </provider> | 65 | </provider> |
68 | </entry> | 66 | </entry> |
69 | </file> | 67 | </file> |
70 | - <file leaf-file-name="login.html.twig" pinned="false" current-in-tab="false"> | 68 | + <file leaf-file-name="login.html.twig" pinned="false" current-in-tab="true"> |
71 | <entry file="file://$PROJECT_DIR$/app/Resources/views/security/login.html.twig"> | 69 | <entry file="file://$PROJECT_DIR$/app/Resources/views/security/login.html.twig"> |
72 | <provider selected="true" editor-type-id="text-editor"> | 70 | <provider selected="true" editor-type-id="text-editor"> |
71 | + <state vertical-scroll-proportion="0.6302521"> | ||
72 | + <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" /> | ||
73 | + <folding> | ||
74 | + <element signature="e#12#26#0#Twig" expanded="true" /> | ||
75 | + <element signature="e#676#684#0#Twig" expanded="true" /> | ||
76 | + <element signature="e#1573#1578#0#Twig" expanded="true" /> | ||
77 | + <element signature="e#2402#2412#0#Twig" expanded="true" /> | ||
78 | + </folding> | ||
79 | + </state> | ||
80 | + </provider> | ||
81 | + </entry> | ||
82 | + </file> | ||
83 | + <file leaf-file-name="login.css" pinned="false" current-in-tab="false"> | ||
84 | + <entry file="file://$PROJECT_DIR$/web/assets/vendor/AppBundle/login.css"> | ||
85 | + <provider selected="true" editor-type-id="text-editor"> | ||
73 | <state vertical-scroll-proportion="-20.0"> | 86 | <state vertical-scroll-proportion="-20.0"> |
74 | - <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" /> | 87 | + <caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" /> |
88 | + <folding /> | ||
89 | + </state> | ||
90 | + </provider> | ||
91 | + </entry> | ||
92 | + </file> | ||
93 | + <file leaf-file-name="portal.css" pinned="false" current-in-tab="false"> | ||
94 | + <entry file="file://$PROJECT_DIR$/web/assets/vendor/AppBundle/portal.css"> | ||
95 | + <provider selected="true" editor-type-id="text-editor"> | ||
96 | + <state vertical-scroll-proportion="24.0"> | ||
97 | + <caret line="9" column="49" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" /> | ||
98 | + <folding /> | ||
99 | + </state> | ||
100 | + </provider> | ||
101 | + </entry> | ||
102 | + </file> | ||
103 | + <file leaf-file-name="index.html.twig" pinned="false" current-in-tab="false"> | ||
104 | + <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> | ||
105 | + <provider selected="true" editor-type-id="text-editor"> | ||
106 | + <state vertical-scroll-proportion="-4.1034484"> | ||
107 | + <caret line="60" column="28" selection-start-line="60" selection-start-column="25" selection-end-line="60" selection-end-column="28" /> | ||
75 | <folding> | 108 | <folding> |
76 | - <element signature="e#828#838#0#Twig" expanded="true" /> | 109 | + <element signature="e#2253#2259#0#Twig" expanded="true" /> |
110 | + <element signature="e#2407#2412#0#Twig" expanded="true" /> | ||
111 | + <element signature="e#12661#12700#0#Twig" expanded="true" /> | ||
77 | </folding> | 112 | </folding> |
78 | </state> | 113 | </state> |
79 | </provider> | 114 | </provider> |
@@ -89,14 +124,14 @@ | @@ -89,14 +124,14 @@ | ||
89 | </provider> | 124 | </provider> |
90 | </entry> | 125 | </entry> |
91 | </file> | 126 | </file> |
92 | - <file leaf-file-name="index.html.twig" pinned="false" current-in-tab="true"> | ||
93 | - <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> | 127 | + <file leaf-file-name="base.html.twig" pinned="false" current-in-tab="false"> |
128 | + <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig"> | ||
94 | <provider selected="true" editor-type-id="text-editor"> | 129 | <provider selected="true" editor-type-id="text-editor"> |
95 | - <state vertical-scroll-proportion="0.70067114"> | ||
96 | - <caret line="38" column="98" selection-start-line="38" selection-start-column="98" selection-end-line="38" selection-end-column="98" /> | 130 | + <state vertical-scroll-proportion="-4.6666665"> |
131 | + <caret line="7" column="108" selection-start-line="7" selection-start-column="108" selection-end-line="7" selection-end-column="108" /> | ||
97 | <folding> | 132 | <folding> |
98 | - <element signature="e#2407#2412#0#Twig" expanded="true" /> | ||
99 | - <element signature="e#12661#12700#0#Twig" expanded="true" /> | 133 | + <element signature="e#2657#2663#0#Twig" expanded="true" /> |
134 | + <element signature="e#2823#2828#0#Twig" expanded="true" /> | ||
100 | </folding> | 135 | </folding> |
101 | </state> | 136 | </state> |
102 | </provider> | 137 | </provider> |
@@ -115,7 +150,6 @@ | @@ -115,7 +150,6 @@ | ||
115 | <component name="IdeDocumentHistory"> | 150 | <component name="IdeDocumentHistory"> |
116 | <option name="CHANGED_PATHS"> | 151 | <option name="CHANGED_PATHS"> |
117 | <list> | 152 | <list> |
118 | - <option value="$PROJECT_DIR$/src/AppBundle/Entity/Estatus.php" /> | ||
119 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/RolInstitucion.php" /> | 153 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/RolInstitucion.php" /> |
120 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Institucion.php" /> | 154 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Institucion.php" /> |
121 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/TipoInstitucion.php" /> | 155 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/TipoInstitucion.php" /> |
@@ -146,7 +180,6 @@ | @@ -146,7 +180,6 @@ | ||
146 | <option value="$PROJECT_DIR$/app/config/security.yml" /> | 180 | <option value="$PROJECT_DIR$/app/config/security.yml" /> |
147 | <option value="$PROJECT_DIR$/web/assets/vendor/smooth-scroll/smooth-scroll.js" /> | 181 | <option value="$PROJECT_DIR$/web/assets/vendor/smooth-scroll/smooth-scroll.js" /> |
148 | <option value="$PROJECT_DIR$/bower.json" /> | 182 | <option value="$PROJECT_DIR$/bower.json" /> |
149 | - <option value="$PROJECT_DIR$/app/Resources/views/base.html.twig" /> | ||
150 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Escalafones.php" /> | 183 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Escalafones.php" /> |
151 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/CentroEstudios.php" /> | 184 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/CentroEstudios.php" /> |
152 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/AreasConcurso.php" /> | 185 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/AreasConcurso.php" /> |
@@ -163,9 +196,11 @@ | @@ -163,9 +196,11 @@ | ||
163 | <option value="$PROJECT_DIR$/src/AppBundle/Security/Authentication/Handler/LoginSuccessHandler.php" /> | 196 | <option value="$PROJECT_DIR$/src/AppBundle/Security/Authentication/Handler/LoginSuccessHandler.php" /> |
164 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Usuarios.php" /> | 197 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Usuarios.php" /> |
165 | <option value="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" /> | 198 | <option value="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" /> |
166 | - <option value="$PROJECT_DIR$/app/Resources/views/security/login.html.twig" /> | ||
167 | <option value="$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php" /> | 199 | <option value="$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php" /> |
168 | <option value="$PROJECT_DIR$/src/AppBundle/Controller/RegistrationController.php" /> | 200 | <option value="$PROJECT_DIR$/src/AppBundle/Controller/RegistrationController.php" /> |
201 | + <option value="$PROJECT_DIR$/app/Resources/views/base.html.twig" /> | ||
202 | + <option value="$PROJECT_DIR$/web/assets/vendor/AppBundle/login.css" /> | ||
203 | + <option value="$PROJECT_DIR$/app/Resources/views/security/login.html.twig" /> | ||
169 | </list> | 204 | </list> |
170 | </option> | 205 | </option> |
171 | </component> | 206 | </component> |
@@ -252,6 +287,106 @@ | @@ -252,6 +287,106 @@ | ||
252 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 287 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
253 | </PATH_ELEMENT> | 288 | </PATH_ELEMENT> |
254 | <PATH_ELEMENT> | 289 | <PATH_ELEMENT> |
290 | + <option name="myItemId" value="web" /> | ||
291 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
292 | + </PATH_ELEMENT> | ||
293 | + <PATH_ELEMENT> | ||
294 | + <option name="myItemId" value="bundles" /> | ||
295 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
296 | + </PATH_ELEMENT> | ||
297 | + <PATH_ELEMENT> | ||
298 | + <option name="myItemId" value="framework" /> | ||
299 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
300 | + </PATH_ELEMENT> | ||
301 | + <PATH_ELEMENT> | ||
302 | + <option name="myItemId" value="images" /> | ||
303 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
304 | + </PATH_ELEMENT> | ||
305 | + <PATH_ELEMENT> | ||
306 | + <option name="myItemId" value="portal" /> | ||
307 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
308 | + </PATH_ELEMENT> | ||
309 | + </PATH> | ||
310 | + <PATH> | ||
311 | + <PATH_ELEMENT> | ||
312 | + <option name="myItemId" value="sym_cea" /> | ||
313 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
314 | + </PATH_ELEMENT> | ||
315 | + <PATH_ELEMENT> | ||
316 | + <option name="myItemId" value="cea_sym" /> | ||
317 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
318 | + </PATH_ELEMENT> | ||
319 | + <PATH_ELEMENT> | ||
320 | + <option name="myItemId" value="web" /> | ||
321 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
322 | + </PATH_ELEMENT> | ||
323 | + <PATH_ELEMENT> | ||
324 | + <option name="myItemId" value="bundles" /> | ||
325 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
326 | + </PATH_ELEMENT> | ||
327 | + <PATH_ELEMENT> | ||
328 | + <option name="myItemId" value="framework" /> | ||
329 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
330 | + </PATH_ELEMENT> | ||
331 | + </PATH> | ||
332 | + <PATH> | ||
333 | + <PATH_ELEMENT> | ||
334 | + <option name="myItemId" value="sym_cea" /> | ||
335 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
336 | + </PATH_ELEMENT> | ||
337 | + <PATH_ELEMENT> | ||
338 | + <option name="myItemId" value="cea_sym" /> | ||
339 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
340 | + </PATH_ELEMENT> | ||
341 | + <PATH_ELEMENT> | ||
342 | + <option name="myItemId" value="web" /> | ||
343 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
344 | + </PATH_ELEMENT> | ||
345 | + <PATH_ELEMENT> | ||
346 | + <option name="myItemId" value="assets" /> | ||
347 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
348 | + </PATH_ELEMENT> | ||
349 | + <PATH_ELEMENT> | ||
350 | + <option name="myItemId" value="vendor" /> | ||
351 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
352 | + </PATH_ELEMENT> | ||
353 | + </PATH> | ||
354 | + <PATH> | ||
355 | + <PATH_ELEMENT> | ||
356 | + <option name="myItemId" value="sym_cea" /> | ||
357 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
358 | + </PATH_ELEMENT> | ||
359 | + <PATH_ELEMENT> | ||
360 | + <option name="myItemId" value="cea_sym" /> | ||
361 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
362 | + </PATH_ELEMENT> | ||
363 | + <PATH_ELEMENT> | ||
364 | + <option name="myItemId" value="web" /> | ||
365 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
366 | + </PATH_ELEMENT> | ||
367 | + <PATH_ELEMENT> | ||
368 | + <option name="myItemId" value="assets" /> | ||
369 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
370 | + </PATH_ELEMENT> | ||
371 | + <PATH_ELEMENT> | ||
372 | + <option name="myItemId" value="vendor" /> | ||
373 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
374 | + </PATH_ELEMENT> | ||
375 | + <PATH_ELEMENT> | ||
376 | + <option name="myItemId" value="AppBundle" /> | ||
377 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
378 | + </PATH_ELEMENT> | ||
379 | + </PATH> | ||
380 | + <PATH> | ||
381 | + <PATH_ELEMENT> | ||
382 | + <option name="myItemId" value="sym_cea" /> | ||
383 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
384 | + </PATH_ELEMENT> | ||
385 | + <PATH_ELEMENT> | ||
386 | + <option name="myItemId" value="cea_sym" /> | ||
387 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
388 | + </PATH_ELEMENT> | ||
389 | + <PATH_ELEMENT> | ||
255 | <option name="myItemId" value="src" /> | 390 | <option name="myItemId" value="src" /> |
256 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 391 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
257 | </PATH_ELEMENT> | 392 | </PATH_ELEMENT> |
@@ -429,17 +564,17 @@ | @@ -429,17 +564,17 @@ | ||
429 | <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" /> | 564 | <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" /> |
430 | </component> | 565 | </component> |
431 | <component name="RecentsManager"> | 566 | <component name="RecentsManager"> |
432 | - <key name="CopyFile.RECENT_KEYS"> | ||
433 | - <recent name="$PROJECT_DIR$/web/bundles/framework/images/portal/descargas" /> | ||
434 | - <recent name="$PROJECT_DIR$/web/bundles/framework/images/portal/actividades" /> | ||
435 | - <recent name="$PROJECT_DIR$/web/bundles/framework/images" /> | ||
436 | - </key> | ||
437 | <key name="MoveFile.RECENT_KEYS"> | 567 | <key name="MoveFile.RECENT_KEYS"> |
438 | <recent name="$PROJECT_DIR$/web/bundles/framework/images/portal" /> | 568 | <recent name="$PROJECT_DIR$/web/bundles/framework/images/portal" /> |
439 | <recent name="$PROJECT_DIR$/web/assets/vendor/AppBundle" /> | 569 | <recent name="$PROJECT_DIR$/web/assets/vendor/AppBundle" /> |
440 | <recent name="$PROJECT_DIR$/web" /> | 570 | <recent name="$PROJECT_DIR$/web" /> |
441 | <recent name="$PROJECT_DIR$/app/Resources/translations" /> | 571 | <recent name="$PROJECT_DIR$/app/Resources/translations" /> |
442 | </key> | 572 | </key> |
573 | + <key name="CopyFile.RECENT_KEYS"> | ||
574 | + <recent name="$PROJECT_DIR$/web/bundles/framework/images/portal/descargas" /> | ||
575 | + <recent name="$PROJECT_DIR$/web/bundles/framework/images/portal/actividades" /> | ||
576 | + <recent name="$PROJECT_DIR$/web/bundles/framework/images" /> | ||
577 | + </key> | ||
443 | </component> | 578 | </component> |
444 | <component name="RunManager"> | 579 | <component name="RunManager"> |
445 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> | 580 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> |
@@ -575,13 +710,6 @@ | @@ -575,13 +710,6 @@ | ||
575 | <watches-manager /> | 710 | <watches-manager /> |
576 | </component> | 711 | </component> |
577 | <component name="editorHistoryManager"> | 712 | <component name="editorHistoryManager"> |
578 | - <entry file="file://$PROJECT_DIR$/web/bundles/framework/css/body.css"> | ||
579 | - <provider selected="true" editor-type-id="text-editor"> | ||
580 | - <state vertical-scroll-proportion="0.0"> | ||
581 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
582 | - </state> | ||
583 | - </provider> | ||
584 | - </entry> | ||
585 | <entry file="file://$PROJECT_DIR$/.bowerrc"> | 713 | <entry file="file://$PROJECT_DIR$/.bowerrc"> |
586 | <provider selected="true" editor-type-id="text-editor"> | 714 | <provider selected="true" editor-type-id="text-editor"> |
587 | <state vertical-scroll-proportion="-1.3333334"> | 715 | <state vertical-scroll-proportion="-1.3333334"> |
@@ -659,11 +787,6 @@ | @@ -659,11 +787,6 @@ | ||
659 | <state /> | 787 | <state /> |
660 | </provider> | 788 | </provider> |
661 | </entry> | 789 | </entry> |
662 | - <entry file="file://$PROJECT_DIR$/web/bundles/framework/images/portal/logo_symfony.png"> | ||
663 | - <provider selected="true" editor-type-id="images"> | ||
664 | - <state /> | ||
665 | - </provider> | ||
666 | - </entry> | ||
667 | <entry file="file://$PROJECT_DIR$/web/bundles/framework/images/portal/escalafon.png"> | 790 | <entry file="file://$PROJECT_DIR$/web/bundles/framework/images/portal/escalafon.png"> |
668 | <provider selected="true" editor-type-id="images"> | 791 | <provider selected="true" editor-type-id="images"> |
669 | <state /> | 792 | <state /> |
@@ -683,13 +806,6 @@ | @@ -683,13 +806,6 @@ | ||
683 | </state> | 806 | </state> |
684 | </provider> | 807 | </provider> |
685 | </entry> | 808 | </entry> |
686 | - <entry file="file://$PROJECT_DIR$/web/assets/vendor/AppBundle/portal.css"> | ||
687 | - <provider selected="true" editor-type-id="text-editor"> | ||
688 | - <state vertical-scroll-proportion="0.1932886"> | ||
689 | - <caret line="9" column="49" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" /> | ||
690 | - </state> | ||
691 | - </provider> | ||
692 | - </entry> | ||
693 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Form/UsuariosType.php"> | 809 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Form/UsuariosType.php"> |
694 | <provider selected="true" editor-type-id="text-editor"> | 810 | <provider selected="true" editor-type-id="text-editor"> |
695 | <state vertical-scroll-proportion="-19.333334"> | 811 | <state vertical-scroll-proportion="-19.333334"> |
@@ -726,14 +842,6 @@ | @@ -726,14 +842,6 @@ | ||
726 | </state> | 842 | </state> |
727 | </provider> | 843 | </provider> |
728 | </entry> | 844 | </entry> |
729 | - <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig"> | ||
730 | - <provider selected="true" editor-type-id="text-editor"> | ||
731 | - <state vertical-scroll-proportion="0.2657718"> | ||
732 | - <caret line="11" column="66" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="66" /> | ||
733 | - <folding /> | ||
734 | - </state> | ||
735 | - </provider> | ||
736 | - </entry> | ||
737 | <entry file="file://$PROJECT_DIR$/app/config/security.yml"> | 845 | <entry file="file://$PROJECT_DIR$/app/config/security.yml"> |
738 | <provider selected="true" editor-type-id="text-editor"> | 846 | <provider selected="true" editor-type-id="text-editor"> |
739 | <state vertical-scroll-proportion="0.8134715"> | 847 | <state vertical-scroll-proportion="0.8134715"> |
@@ -924,7 +1032,7 @@ | @@ -924,7 +1032,7 @@ | ||
924 | </entry> | 1032 | </entry> |
925 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php"> | 1033 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/SecurityController.php"> |
926 | <provider selected="true" editor-type-id="text-editor"> | 1034 | <provider selected="true" editor-type-id="text-editor"> |
927 | - <state vertical-scroll-proportion="-14.925926"> | 1035 | + <state vertical-scroll-proportion="-22.666666"> |
928 | <caret line="41" column="25" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="25" /> | 1036 | <caret line="41" column="25" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="25" /> |
929 | <folding> | 1037 | <folding> |
930 | <element signature="e#1346#1353#1#PHP" expanded="true" /> | 1038 | <element signature="e#1346#1353#1#PHP" expanded="true" /> |
@@ -955,16 +1063,6 @@ | @@ -955,16 +1063,6 @@ | ||
955 | </state> | 1063 | </state> |
956 | </provider> | 1064 | </provider> |
957 | </entry> | 1065 | </entry> |
958 | - <entry file="file://$PROJECT_DIR$/app/Resources/views/security/login.html.twig"> | ||
959 | - <provider selected="true" editor-type-id="text-editor"> | ||
960 | - <state vertical-scroll-proportion="-20.0"> | ||
961 | - <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" /> | ||
962 | - <folding> | ||
963 | - <element signature="e#828#838#0#Twig" expanded="true" /> | ||
964 | - </folding> | ||
965 | - </state> | ||
966 | - </provider> | ||
967 | - </entry> | ||
968 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Usuarios.php"> | 1066 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Usuarios.php"> |
969 | <provider selected="true" editor-type-id="text-editor"> | 1067 | <provider selected="true" editor-type-id="text-editor"> |
970 | <state vertical-scroll-proportion="9.103448"> | 1068 | <state vertical-scroll-proportion="9.103448"> |
@@ -975,14 +1073,55 @@ | @@ -975,14 +1073,55 @@ | ||
975 | </entry> | 1073 | </entry> |
976 | <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> | 1074 | <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig"> |
977 | <provider selected="true" editor-type-id="text-editor"> | 1075 | <provider selected="true" editor-type-id="text-editor"> |
978 | - <state vertical-scroll-proportion="0.70067114"> | ||
979 | - <caret line="38" column="98" selection-start-line="38" selection-start-column="98" selection-end-line="38" selection-end-column="98" /> | 1076 | + <state vertical-scroll-proportion="-4.1034484"> |
1077 | + <caret line="60" column="28" selection-start-line="60" selection-start-column="25" selection-end-line="60" selection-end-column="28" /> | ||
980 | <folding> | 1078 | <folding> |
1079 | + <element signature="e#2253#2259#0#Twig" expanded="true" /> | ||
981 | <element signature="e#2407#2412#0#Twig" expanded="true" /> | 1080 | <element signature="e#2407#2412#0#Twig" expanded="true" /> |
982 | <element signature="e#12661#12700#0#Twig" expanded="true" /> | 1081 | <element signature="e#12661#12700#0#Twig" expanded="true" /> |
983 | </folding> | 1082 | </folding> |
984 | </state> | 1083 | </state> |
985 | </provider> | 1084 | </provider> |
986 | </entry> | 1085 | </entry> |
1086 | + <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig"> | ||
1087 | + <provider selected="true" editor-type-id="text-editor"> | ||
1088 | + <state vertical-scroll-proportion="-4.6666665"> | ||
1089 | + <caret line="7" column="108" selection-start-line="7" selection-start-column="108" selection-end-line="7" selection-end-column="108" /> | ||
1090 | + <folding> | ||
1091 | + <element signature="e#2657#2663#0#Twig" expanded="true" /> | ||
1092 | + <element signature="e#2823#2828#0#Twig" expanded="true" /> | ||
1093 | + </folding> | ||
1094 | + </state> | ||
1095 | + </provider> | ||
1096 | + </entry> | ||
1097 | + <entry file="file://$PROJECT_DIR$/web/assets/vendor/AppBundle/portal.css"> | ||
1098 | + <provider selected="true" editor-type-id="text-editor"> | ||
1099 | + <state vertical-scroll-proportion="24.0"> | ||
1100 | + <caret line="9" column="49" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" /> | ||
1101 | + <folding /> | ||
1102 | + </state> | ||
1103 | + </provider> | ||
1104 | + </entry> | ||
1105 | + <entry file="file://$PROJECT_DIR$/web/assets/vendor/AppBundle/login.css"> | ||
1106 | + <provider selected="true" editor-type-id="text-editor"> | ||
1107 | + <state vertical-scroll-proportion="-20.0"> | ||
1108 | + <caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" /> | ||
1109 | + <folding /> | ||
1110 | + </state> | ||
1111 | + </provider> | ||
1112 | + </entry> | ||
1113 | + <entry file="file://$PROJECT_DIR$/app/Resources/views/security/login.html.twig"> | ||
1114 | + <provider selected="true" editor-type-id="text-editor"> | ||
1115 | + <state vertical-scroll-proportion="0.6302521"> | ||
1116 | + <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" /> | ||
1117 | + <folding> | ||
1118 | + <element signature="e#12#26#0#Twig" expanded="true" /> | ||
1119 | + <element signature="e#676#684#0#Twig" expanded="true" /> | ||
1120 | + <element signature="e#1573#1578#0#Twig" expanded="true" /> | ||
1121 | + <element signature="e#2402#2412#0#Twig" expanded="true" /> | ||
1122 | + </folding> | ||
1123 | + </state> | ||
1124 | + </provider> | ||
1125 | + </entry> | ||
987 | </component> | 1126 | </component> |
988 | </project> | 1127 | </project> |
989 | \ No newline at end of file | 1128 | \ No newline at end of file |
app/Resources/views/base.html.twig
@@ -12,7 +12,45 @@ | @@ -12,7 +12,45 @@ | ||
12 | <body data-spy="scroll" data-offset="20" data-target="#navbar"> | 12 | <body data-spy="scroll" data-offset="20" data-target="#navbar"> |
13 | 13 | ||
14 | {% block body %} | 14 | {% block body %} |
15 | - {% block navegacion %} {% endblock %} | 15 | + {% block navegacion %} |
16 | + | ||
17 | + | ||
18 | + | ||
19 | + <!-- Nav Menu Section --> | ||
20 | + <div class="logo-menu"> | ||
21 | + <nav class="navbar navbar-default navbar-fixed-top" role="navigation" data-spy="affix" data-offset-top="50"> | ||
22 | + <div class="container"> | ||
23 | + <!-- Brand and toggle get grouped for better mobile display --> | ||
24 | + <div class="navbar-header col-md-3"> | ||
25 | + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar"> | ||
26 | + <span class="sr-only">Toggle navigation</span> | ||
27 | + <span class="icon-bar"></span> | ||
28 | + <span class="icon-bar"></span> | ||
29 | + <span class="icon-bar"></span> | ||
30 | + </button> | ||
31 | + <a class="navbar-brand" href="#home"><i class="fa fa-briefcase"></i> CEA@UBV</a> | ||
32 | + </div> | ||
33 | + | ||
34 | + <div class="collapse navbar-collapse" id="navbar"> | ||
35 | + <ul class="nav navbar-nav col-md-9 pull-right"> | ||
36 | + <li class="active"><a data-scroll href="#area-principal"><i class="fa fa-home"></i> Inicio</a></li> | ||
37 | + <li><a data-scroll href="#servicios"><i class="fa fa-cogs"></i> Servicios</a></li> | ||
38 | + <li><a data-scroll href="#actividades"><i class="fa fa-flask"></i> Foto</a></li> | ||
39 | + <li><a data-scroll href="#descarga"><i class="fa fa-puzzle-piece"></i> Descargas</a></li> | ||
40 | + <li><a data-scroll href="#about"><i class="fa fa-info"></i> El CEA</a></li> | ||
41 | + <li><a data-scroll href="#adscripcion"><i class="fa fa-envelope"></i> Adscripción</a></li> | ||
42 | + {% if app.user %} | ||
43 | + <li><a href="{{ path('logout') }}"><i class="fa fa-close"></i> logout</a></li> | ||
44 | + {% else %} | ||
45 | + <li><a href="{{ path('login') }}"><i class="fa fa-user"></i> Ingresar</a></li> | ||
46 | + {% endif %} | ||
47 | + </ul> | ||
48 | + </div> | ||
49 | + </div> | ||
50 | + </nav> | ||
51 | + </div> | ||
52 | + | ||
53 | + {% endblock %} | ||
16 | {% block principal %} {% endblock %} | 54 | {% block principal %} {% endblock %} |
17 | 55 | ||
18 | {% endblock %} | 56 | {% endblock %} |
app/Resources/views/security/login.html.twig
1 | {% extends 'base.html.twig' %} | 1 | {% extends 'base.html.twig' %} |
2 | 2 | ||
3 | + | ||
4 | +{% block stylesheets %} | ||
5 | + {{ parent() }} | ||
6 | + <link rel="stylesheet" href="{{ asset('assets/vendor/AppBundle/login.css') }}"> | ||
7 | +{% endblock %} | ||
8 | + | ||
3 | {% block body %} | 9 | {% block body %} |
4 | -{% if error %} | ||
5 | - <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div> | ||
6 | -{% endif %} | ||
7 | -<div class="container"> | ||
8 | - <form action="{{ path('login') }}" method="post" role="form"> | ||
9 | - <div class="form-group"> | ||
10 | - <label for="username">Username:</label> | ||
11 | - <input type="text" class="form-control" id="username" name="_username" value="{{ last_username }}" /> | ||
12 | - </div> | 10 | + {% block navegacion %} |
13 | 11 | ||
14 | - <div class="form-group"> | ||
15 | - <label for="password">Password:</label> | ||
16 | - <input type="password" class="form-control" id="password" name="_password" /> | ||
17 | - </div> | ||
18 | 12 | ||
19 | - <input type="hidden" name="_csrf_token" | ||
20 | - value="{{ csrf_token('authenticate') }}" | ||
21 | - > | 13 | + <nav class="navbar navbar-default"> |
14 | + <div class="container-fluid"> | ||
15 | + <div class="navbar-header"> | ||
16 | + <a class="navbar-brand" href="#"> | ||
17 | + Centro de Estudios Ambientales UBV | ||
18 | + </a> | ||
19 | + </div> | ||
20 | + | ||
21 | + <div class="collapse navbar-collapse"> | ||
22 | + <ul class="nav navbar-nav navbar-right"> | ||
23 | + <li><a href="{{ path('homepage') }}">Regresar al Portal</a></li> | ||
24 | + </ul> | ||
25 | + | ||
26 | + </div> | ||
27 | + | ||
28 | + </div> | ||
29 | + | ||
30 | + </nav> | ||
31 | + | ||
32 | + | ||
33 | + {% endblock %} | ||
34 | + | ||
35 | + | ||
36 | + <div class="content-wrapper"> | ||
37 | + <div class="container"> | ||
38 | + <div class="row"> | ||
39 | + <div class="col-md-12"> | ||
40 | + <h4 class="page-head-line">Acceso al sistema CEA@UBV</h4> | ||
41 | + | ||
42 | + </div> | ||
22 | 43 | ||
44 | + </div> | ||
45 | + <div class="row"> | ||
46 | + <div class="col-md-6"> | ||
23 | 47 | ||
24 | - <input type="hidden" name="_target_path" value="{{ path('user_roles') }}" /> | 48 | + <div class="col-md-4"> |
49 | + <img src="{{ asset('bundles/framework/images/portal/logo_ubv.png') }}" /> | ||
50 | + </div> | ||
25 | 51 | ||
52 | + <div class="col-md-8"> | ||
53 | + {% if error %} | ||
54 | + <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div> | ||
55 | + {% endif %} | ||
56 | + <form action="{{ path('login') }}" method="post" role="form"> | ||
57 | + <div class="form-group"> | ||
58 | + <label for="username">Nombre de Usuario:</label> | ||
59 | + <input type="text" class="form-control" id="username" name="_username" value="{{ last_username }}" /> | ||
60 | + </div> | ||
26 | 61 | ||
62 | + <div class="form-group"> | ||
63 | + <label for="password">Contraseña:</label> | ||
64 | + <input type="password" class="form-control" id="password" name="_password" /> | ||
65 | + </div> | ||
66 | + | ||
67 | + <input type="hidden" name="_csrf_token" | ||
68 | + value="{{ csrf_token('authenticate') }}" | ||
69 | + > | ||
70 | + | ||
71 | + | ||
72 | + <input type="hidden" name="_target_path" value="{{ path('user_roles') }}" /> | ||
73 | + | ||
74 | + | ||
75 | + | ||
76 | + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-user"></span> Ingresar</button> | ||
77 | + </form> | ||
78 | + <hr /> | ||
79 | + </div> | ||
80 | + </div> | ||
81 | + <div class="col-md-5"> | ||
82 | + | ||
83 | + <div class="alert alert-success"> | ||
84 | + <strong> ¿Ingresa por Primera Vez? Aquí unas breves instrucciones:</strong> | ||
85 | + <ul> | ||
86 | + <li> | ||
87 | + A su dirección de Correo deben haber llegado las credenciales de Acceso luego de haber solicitado Adscripción | ||
88 | + </li> | ||
89 | + <li> | ||
90 | + Una vez dentro, realizará el proceso de solicitud de adscripción al CEA | ||
91 | + </li> | ||
92 | + <li> | ||
93 | + Para este proceso debe tener en digital los siguientes documentos: | ||
94 | + <ol> | ||
95 | + <li>Digital de la Constancia de Trabajo (*)</li> | ||
96 | + <li>Digital del Título de Pregrado (*)</li> | ||
97 | + <li>Digital del Título de Postgrado mas reciente</li> | ||
98 | + <li>Digital de la Constancia de Aprobación de Concurso de Oposición</li> | ||
99 | + <li>Digital de la Constancia de Aprobación de Ascensos</li> | ||
100 | + | ||
101 | + </ol> | ||
102 | + </li> | ||
103 | + | ||
104 | + </ul> | ||
105 | + | ||
106 | + </div> | ||
107 | + </div> | ||
108 | + | ||
109 | + </div> | ||
110 | + </div> | ||
111 | + </div> | ||
27 | 112 | ||
28 | - <button type="submit">login</button> | ||
29 | - </form> | ||
30 | -</div> | ||
31 | {% endblock %} | 113 | {% endblock %} |
32 | \ No newline at end of file | 114 | \ No newline at end of file |
app/sessions/sess_17mmdi4dbu0iop1qs5mui1b4n7
@@ -1 +0,0 @@ | @@ -1 +0,0 @@ | ||
1 | -_sf2_attributes|a:4:{s:15:"_csrf/solicitar";s:43:"tOsKi5IH297TDpeeh_W3DMFKji4j1SILw8ijxhP2F14";s:18:"_csrf/authenticate";s:43:"HaqywcAjtuH_2ISxmXoB1297by0479lJtv6rwNNsY8c";s:14:"_security_main";s:387:"C:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":299:{a:3:{i:0;N;i:1;s:4:"main";i:2;s:259:"a:4:{i:0;C:25:"AppBundle\Entity\Usuarios":106:{a:3:{i:0;i:11;i:1;s:8:"wramones";i:2;s:60:"$2y$13$UN60aw0H6QLaO5k.ghyvIOrQjW1UPt210b6ReDJUgQGZ7VK9SwoeK";}}i:1;b:1;i:2;a:1:{i:0;C:21:"AppBundle\Entity\Role":38:{a:2:{i:0;i:3;i:1;s:12:"ROLE_DOCENTE";}}}i:3;a:0:{}}";}}";s:10:"_csrf/user";s:43:"Vs5OUa-VjbU7lUOhdb34i1IeoO_L70Xj2wX_57c5JBw";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467832962;s:1:"c";i:1467832662;s:1:"l";s:1:"0";} | ||
2 | \ No newline at end of file | 0 | \ No newline at end of file |
app/sessions/sess_rrvo7g5k0n5sf3mgdorhqifsv3
@@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
1 | +_sf2_attributes|a:2:{s:15:"_csrf/solicitar";s:43:"teDYeoRVLhqkon1sbSKYpV4G6mxuZ1GMSQFUgRjshFg";s:18:"_csrf/authenticate";s:43:"VlN7CPotazsmu1ICwwhze9mM0RbA1CbhB-LodV0c8Og";}_sf2_flashes|a:0:{}_sf2_meta|a:3:{s:1:"u";i:1467842031;s:1:"c";i:1467842029;s:1:"l";s:1:"0";} | ||
0 | \ No newline at end of file | 2 | \ No newline at end of file |
web/assets/vendor/AppBundle/login.css
@@ -0,0 +1,32 @@ | @@ -0,0 +1,32 @@ | ||
1 | +body{ background: url('../../../bundles/framework/images/portal/body-bg.png'); color:#838383; font: 13px/1.7em 'Open Sans';} | ||
2 | + | ||
3 | +.page-head-line { | ||
4 | + font-weight: 900; | ||
5 | + padding-bottom: 20px; | ||
6 | + border-bottom: 2px solid #0b5e3e; | ||
7 | + text-transform: uppercase; | ||
8 | + color: #0b5e3e; | ||
9 | + font-size: 20px; | ||
10 | + margin-bottom: 40px; | ||
11 | +} | ||
12 | + | ||
13 | +/*------------------------------------------------------------------ | ||
14 | +[2. Navbar / .navbar] | ||
15 | +*/ | ||
16 | + | ||
17 | +.navbar-default{ | ||
18 | + background-color: #3b8341; | ||
19 | + border-color: transparent; | ||
20 | + border-radius: 0; | ||
21 | + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.4); | ||
22 | +} | ||
23 | + | ||
24 | +.navbar-default .navbar-brand{ | ||
25 | + color: white; | ||
26 | + font-size: 25px; | ||
27 | +} | ||
28 | + | ||
29 | +.navbar-default .navbar-nav>li>a{ | ||
30 | + color: white; | ||
31 | + font-size: 18px; | ||
32 | +} | ||
0 | \ No newline at end of file | 33 | \ No newline at end of file |