diff --git a/build/api/module/departementController.php b/build/api/module/departmentController.php similarity index 96% rename from build/api/module/departementController.php rename to build/api/module/departmentController.php index d312128..747f0a4 100644 --- a/build/api/module/departementController.php +++ b/build/api/module/departmentController.php @@ -12,7 +12,7 @@ namespace api\module; use database\core\Repo; use database\repo\professor; -class departementController +class departmentController { public function put($args){ diff --git a/config/modules.json b/config/modules.json index ec622c8..e2166da 100644 --- a/config/modules.json +++ b/config/modules.json @@ -71,13 +71,13 @@ } }, - "departement":{ + "department":{ "PUT":{ "des": "Switch the user on another department database", "per": [], "par": { - "department": {"des": "Department id", "typ": "id"} + "URL0": {"des": "Department id", "typ": "id", "ren": "department" } } }, "errors":{ @@ -90,7 +90,7 @@ }, "stats":{ "GET": { - "des": "Get the statistics about the departement", + "des": "Get the statistics about the department", "per": [], "par": { } diff --git a/webpack/scss/header.scss b/webpack/scss/header.scss index 1155527..4a25340 100644 --- a/webpack/scss/header.scss +++ b/webpack/scss/header.scss @@ -14,13 +14,14 @@ // flex properties flex-direction: row; - justify-content: space-between; + justify-content: flex-start; align-items: center; z-index: 150; /* (1) Version management */ + & > div.departments, & > div.versions{ /* (1.1) Version status */ @@ -61,7 +62,7 @@ background-color: $form-invalid-color; } - &[data-id='0']:before{ + &[data-id='-1']:before{ background-color: $form-valid-color; } @@ -69,20 +70,24 @@ } /* (1.2) Version dialog (to switch to another) */ + & > div.department-dialog, & > div.version-dialog{ display: block; position: absolute; - top: #{$header-height + .5em}; - left: 1em; + margin-top: 0; + margin-left: 0; + + &.department-dialog{ margin-left: 1em; } // padding: 1em .5em; border: 1px solid #ddd; - border-radius: 3px; + border-top: 0; + border-radius: 0 0 3px 3px; background-color: #fff; - box-shadow: 0 2px 2px #ddd; + // box-shadow: 0 2px 2px #ddd; overflow: hidden; @@ -120,7 +125,7 @@ background-color: $form-invalid-color; } - &[data-id='0']:before{ + &[data-id='-1']:before{ background-color: $form-valid-color; } @@ -129,6 +134,21 @@ } + /* (2) Department | Version layout */ + & > div.departments > div.current{ + margin-right: 0; + padding-left: 1em; + border-radius: 3px 0 0 3px; + + &:before{ content: none; } + } + + & > div.versions > div.current{ + margin-left: 0; + border-radius: 0 3px 3px 0; + border-left: 0; + } + } \ No newline at end of file diff --git a/webpack/vue/header.vue b/webpack/vue/header.vue index 192affc..f258283 100644 --- a/webpack/vue/header.vue +++ b/webpack/vue/header.vue @@ -2,13 +2,22 @@