Merge branch 'release/1.2.6'

CHANGELOG.md

@@ -1,6 +1,11 @@
 
 # CHANGELOG
 
+*1.2.6* (2018-09-11)
+  - Styleguide 1.3.0 + Header search
+  - Refactor faculty to schools for all visible parts
+  - Fix homepage behaviour
+
 *1.2.5* (2018-09-07)
   - epfl-video: render HTML
   - epfl-links-group: render HTML

VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

assets/package.json

@@ -0,0 +1,92 @@
+{
+  "name": "epfl-elements",
+  "version": "1.3.0",
+  "license": "MIT",
+  "main": "index.html",
+  "repository": {
+    "type": "git",
+    "url": "[email protected]:epfl-idevelop/elements.git"
+  },
+  "scripts": {
+    "start": "toolbox serve",
+    "build": "toolbox build",
+    "deploy": "toolbox build styleguide && toolbox deploy",
+    "test": "backstop test",
+    "test:reference": "backstop reference",
+    "test:approve": "backstop approve",
+    "test:report": "backstop openReport",
+    "test:update_config": "node scripts/backstop_config_updater.js",
+    "test:info": "node scripts/backstop_status.js"
+  },
+  "browserslist": [
+    "> 1% in CH",
+    "last 2 versions"
+  ],
+  "eslintConfig": {
+    "parser": "babel-eslint",
+    "extends": "eslint-config-airbnb",
+    "env": {
+      "browser": true
+    },
+    "rules": {
+      "arrow-body-style": 0,
+      "camelcase": 0,
+      "global-require": 0,
+      "import/extensions": 0,
+      "import/no-unresolved": 0
+    }
+  },
+  "stylelint": {
+    "ignoreFiles": [
+      "assets/components/base.scss",
+      "assets/config/bootstrap.scss",
+      "assets/config/bootstrap-variables.scss"
+    ],
+    "plugins": [
+      "stylelint-order"
+    ],
+    "extends": "stylelint-config-recommended-scss",
+    "rules": {
+      "at-rule-no-vendor-prefix": true,
+      "media-feature-name-no-vendor-prefix": true,
+      "property-no-vendor-prefix": true,
+      "selector-no-vendor-prefix": true,
+      "value-no-vendor-prefix": true,
+      "no-descending-specificity": null,
+      "selector-pseudo-element-colon-notation": "single",
+      "order/order": [
+        "custom-properties",
+        "dollar-variables",
+        "declarations",
+        "rules"
+      ],
+      "order/properties-order": [
+        "content",
+        "display",
+        "flex",
+        "position",
+        "top",
+        "right",
+        "bottom",
+        "left",
+        "float",
+        "width",
+        "height",
+        "margin",
+        "padding",
+        "background",
+        "border",
+        "font-familly",
+        "font-size",
+        "line-height",
+        "font-weight",
+        "font-style",
+        "color",
+        "transform",
+        "transition"
+      ]
+    }
+  },
+  "dependencies": {},
+  "devDependencies": {}
+}

header.php

@@ -40,16 +40,30 @@
 				) );
 			?>
 
-		<form action="https://preview.liip.ch/epfl-search/api/" class="d-xl-none">
-			<div class="input-group search w-100">
-				<div class="input-group-prepend">
-					<span class="input-group-text">
-						<svg class="icon"><use xlink:href="#icon-search"></use></svg>
-					</span>
-				</div>
-				<input type="text" class="form-control" placeholder="Rechercher">
+	<div class="dropdown dropright search d-none d-xl-block">
+		<a class="dropdown-toggle" href="#" data-toggle="dropdown">
+			<svg class="icon" aria-hidden="true"><use xlink:href="#icon-search"></use></svg>
+		</a>
+		<form action="https://search.epfl.ch/" class="dropdown-menu border-0 p-0">
+			<div class="search-form mt-1 input-group">
+				<label for="search" class="sr-only">Rechercher sur le site</label>
+				<input type="text" class="form-control" name="q" placeholder="Rechercher" >
+				<button type="submit" class="d-none d-xl-block btn btn-primary input-group-append" type="button">Valider</button>
 			</div>
 		</form>
+	</div>
+
+	<form action="https://search.epfl.ch/" class="d-lg-none">
+		<div class="input-group search-mobile" role="search">
+			<div class="input-group-prepend">
+				<span class="input-group-text">
+					<svg class="icon" aria-hidden="true"><use xlink:href="#icon-search"></use></svg>
+				</span>
+			</div>
+				<label for="search" class="sr-only">Rechercher sur le site</label>
+				<input type="text" class="form-control" name="q" placeholder="Rechercher">
+		</div>
+	</form>
 
 	<?php get_template_part( 'template-parts/language-switcher' ) ?>
 

index.php

@@ -7,9 +7,7 @@
 
 global $containerClasses;
 
-if (!is_front_page()) {
-	get_template_part( 'template-parts/breadcrumb');
-}
+get_template_part( 'template-parts/breadcrumb');
 ?>
 
 <div class="<?php echo $containerClasses ?>">

page.php

@@ -8,9 +8,7 @@
 global $containerClasses;
 global $mainClasses;
 
-if (!is_front_page()) {
-	get_template_part( 'template-parts/breadcrumb');
-}
+get_template_part( 'template-parts/breadcrumb');
 ?>
 
 <div class="<?php echo $containerClasses ?>">

shortcodes/index.php

@@ -1,7 +1,7 @@
 <?php
 
 require_once(get_template_directory().'/shortcodes/templates/card-img-top.php');
-require_once(get_template_directory().'/shortcodes/faculties/controller.php');
+require_once(get_template_directory().'/shortcodes/schools/controller.php');
 require_once(get_template_directory().'/shortcodes/definition_list/controller.php');
 require_once(get_template_directory().'/shortcodes/introduction/controller.php');
 require_once(get_template_directory().'/shortcodes/hero/controller.php');

shortcodes/faculties/controller.php → shortcodes/schools/controller.php

@@ -3,20 +3,20 @@
 require_once(__DIR__.'/shortcake.php');
 
 // register
-add_shortcode( 'epfl_faculties', 'renderFaculties' );
+add_shortcode( 'epfl_faculties', 'renderSchools' );
 
 // render
-function renderFaculties ($args) {
-  set_query_var('epfl_faculties_data', $args);
+function renderSchools ($args) {
+  set_query_var('epfl_schools_data', $args);
 
   ob_start();
   if (is_admin()) {
     // render placeholder for backend editor
-    set_query_var('epfl_placeholder_title', 'Faculties');
+    set_query_var('epfl_placeholder_title', 'Schools');
     get_template_part('shortcodes/placeholder');
   } else {
     // render shortcode
-    get_template_part('shortcodes/faculties/view');
+    get_template_part('shortcodes/schools/view');
   }
   return ob_get_clean();
 }