diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug index e67808d7b30a38add0c8f664b6402d5db2669803..aa872bb8eca74a55a5d12523dea3d2c09974cf8c 100644 --- a/src/includes/entrepreneur/resources/list.pug +++ b/src/includes/entrepreneur/resources/list.pug @@ -157,7 +157,7 @@ container.block_list next='entrepreneur-resource-detail' - paginate-by="2" + paginate-by="5" ) //Step 2 @@ -210,7 +210,7 @@ container.block_list class="panel" next='entrepreneur-resource-detail' - paginate-by="2" + paginate-by="5" ) div.step @@ -261,7 +261,7 @@ container.block_list class="panel" next='entrepreneur-resource-detail' - paginate-by="2" + paginate-by="5" ) //Step 4 diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug index 8e5360363430d0dd827bfcff6a95af4f969ffd26..3098b5ab9d06b96125dafced61fab420787b8bcd 100644 --- a/src/includes/mentor/browseDatabase.pug +++ b/src/includes/mentor/browseDatabase.pug @@ -146,6 +146,7 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields class="panel" + next='mentor-resource-detail' paginate-by="5" ) @@ -198,6 +199,7 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields class="panel" + next='mentor-resource-detail' paginate-by="5" ) @@ -251,6 +253,7 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields class="panel" + next='mentor-resource-detail' paginate-by="5" ) @@ -304,6 +307,7 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields class="panel" + next='mentor-resource-detail' paginate-by="5" ) @@ -356,6 +360,7 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields class="panel" + next='mentor-resource-detail' paginate-by="5" ) @@ -408,7 +413,7 @@ container.block_list.flex.flex_espace label-fields='' multiple-fields class="panel" - next='entrepreneur-resource-detail' + next='mentor-resource-detail' paginate-by="5" ) diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug index 64fc8d9204d1ef8c71dac0c81835ca5c0dec4e5e..b4178481c5c533411db06162712071b551ace061 100644 --- a/src/includes/mentor/dashboard.pug +++ b/src/includes/mentor/dashboard.pug @@ -11,18 +11,18 @@ header#header(role='banner') include ./components/header.pug section#home + sib-router + sib-ac-checker(permission="acl:Read" bind-resources) + sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id) + #mentor-resource-list(hidden).no-sidebar.container include resources/list.pug sib-router sib-ac-checker(permission="acl:Write" bind-resources) - sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id) sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id) sib-route(name='resource-validation-process') - dialog#mentor-resource-detail.no-sidebar - include resources/detail.pug - dialog#mentor-resource-validate.no-sidebar include resources/validate.pug @@ -32,6 +32,9 @@ section#home #mentor-database(hidden).no-sidebar.container include ./browseDatabase.pug + dialog#mentor-resource-detail.no-sidebar + include resources/detail.pug + #mentor-resource-create(hidden).no-sidebar.container sib-link(class="backlink", next="mentor-resource-list")=`${data.BackToDashboard}` include resources/create.pug diff --git a/src/styles/index.scss b/src/styles/index.scss index 19d7d5d02f82e7641538cf529456001f2b954d27..1cf19405b439913da4f2049cd456b3ba333b4ec7 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -435,7 +435,8 @@ p{ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ .ico_gauche, #mentor-resource-detail cs-display-link a, #mentor-resource-validate cs-display-link a, #entrepreneur-resource-detail cs-display-link a, -#entrepreneur-resource-list cs-display-property[name="name"] p, #public-resource-detail cs-display-link a{ +#entrepreneur-resource-list cs-display-property[name="name"] p, #mentor-database cs-display-property[name="name"] p, #public-resource-list cs-display-property[name="name"] p, +#public-resource-detail cs-display-link a { padding-left: 3.5rem; position: relative; } @@ -444,7 +445,11 @@ p{ position: relative; } -.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before, #mentor-resource-validate a:before, #entrepreneur-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before, #confirm_suppress button:before, header span:before, #public-resource-detail cs-display-link[label="Link to resource"] a:before{ +.ico_gauche:before,.ico_droite:before, #mentor-resource-detail a:before, #mentor-resource-validate a:before, +#entrepreneur-resource-detail a:before, #entrepreneur-resource-list cs-display-property[name="name"] p:before, +#public-resource-list cs-display-property[name="name"] p:before,#mentor-database cs-display-property[name="name"] p:before, +#confirm_suppress button:before, header span:before, +#public-resource-detail cs-display-link[label="Link to resource"] a:before{ font-family: "Font Awesome 5 pro"; font-weight: 900; position : absolute; @@ -454,7 +459,7 @@ p{ left: 1.4rem; top: .7rem; } -ico_droite:before{ +.ico_droite:before{ left: 1.4rem; top: .7rem; } @@ -480,7 +485,10 @@ header .ico_search:before{ .ico_arrow:before{ content: "\f061"; } -#entrepreneur-resource-list cs-display-property[name="name"] p:before{ + +#entrepreneur-resource-list cs-display-property[name="name"] p:before, +#public-resource-list cs-display-property[name="name"] p:before, +#mentor-database cs-display-property[name="name"] p:before{ content:"\f005"; left: 0.4rem; top: 0.2rem; @@ -1887,7 +1895,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ #confirm_suppress > div, #confirm_status_change > div, #resource-validation-process > div, #resource-validation-process-confirmation > div { margin-top: 5%; } -/* Partie public */ + /* Partie public */ #public-resource-list container .step cs-display-resource-property[name="format.name"] p{ padding: 1.5rem; } @@ -1897,7 +1905,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ #entrepreneur-resource-list .step div div fake-like, #public-resource-list .step div div fake-like, #mentor-database .step div div fake-like{ right: 30%; } - #entrepreneur-resource-list cs-display-property[name="name"] p:before{ + #entrepreneur-resource-list cs-display-property[name="name"] p:before, + #public-resource-list cs-display-property[name="name"] p:before, + #mentor-database cs-display-property[name="name"] p:before{ top: 0; left: 0; }