Merge branch 'release/1.2.0'

CHANGELOG.md

@@ -1,6 +1,14 @@
 
 # CHANGELOG
 
+*1.2.0* (2018-08-27)
+  - MVC structure improvements for shortcodes
+  - Theme translation setup
+  - debug breadcrumbs to work with polylang and all languages
+  - memento shortcode implementation
+  - epfl-news: finish first implementation, and implement second template
+  - improve repository doc concerning release management
+
 *1.1.2* (2018-08-21)
   - merge QA science shortcode
   - implement styleguide version (1.1.2)
@@ -38,5 +46,5 @@
   - recover dev build of styleguide for release (commit 9877c9b666029200d2dc2edcc8f8cd489473c57a on branch feature/pages)
 
 *1.0.0* (2018-07-26)
-  - First release 
+  - First release
   - current state of the styleguide (1.0.0)

README.md

@@ -14,13 +14,30 @@ Epfl theme (Wordpress)
   2. Nothing more, you're ready to go! 🚀
 
 ## Recovering the last version of the styleguide
-  1. head towards [https://github.com/epfl-idevelop/elements](https://github.com/epfl-idevelop/elements)
-  2. clone the repo locally
-  3. install the project locally (see elements documentation)
-  4. launch `$ yarn && yarn build` or `$ docker-compose up builder`
-  5. after build finished, move the content of the `elements/build/` folder to `epfl-theme/assets`
-  6. commit the builds
-  7. here you go, you just updated the styleguide version container in this theme !
+  1. head towards [https://github.com/epfl-idevelop/elements/tree/dist/frontend](https://github.com/epfl-idevelop/elements/tree/dist/frontend)
+  2. use git clone / download zip to recover the files of this branch
+  3. put all these recovered files into `wp-theme-2018/assets`
+  4. commit the builds
+  5. here you go, you just updated the styleguide version contained in this theme !
+
+## deploying a release
+  Requirements:
+  - understand the gitflow logic ([gitflow cheatsheet](https://danielkummer.github.io/git-flow-cheatsheet/))
+  - install `git flow` locally [How to install gitflow](https://github.com/nvie/gitflow/wiki/Installation)
+  - make sure your local branches `master` and `dev` are up-to-date
+  - initialise git flow in your repo `git flow init`
+  - start a release: `git flow release start x.x.x`
+  - update the following files:
+    - `VERSION` with the version number
+    - `CHANGELOG.md` with a description of all the changes since last release
+  - commit them in a "bump version" commit
+  - finish the release: `git flow release finish x.x.x`
+  - head over this repo on github, on the **release** tab
+  - go to **Draft a new release**
+  - choose the release number you just created, insert the changelog informations into the release description
+  - Publish the release
+  - congratulation, the repo has been released ! 🎉
+
 
 ## Shortcodes
 Each shortcode has its own subfoler in the `shortcodes/` directory, placed at the root of the template.

VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

archive.php

@@ -30,7 +30,7 @@
 						endwhile; // End of the loop.
 					else : ?>
 							<h2>
-								<?php echo esc_html__( 'Aucun article trouvé', 'epfl-shortcodes' ) ?>
+								<?php esc_html_e( 'No article found', 'epfl' ) ?>
 							</h2>
 							<?php endif; ?>
 					</div>

functions.php

@@ -44,7 +44,7 @@ function epfl_setup() {
 
 		// This theme uses wp_nav_menu() in one location.
 		register_nav_menus( array(
-			'menu-1' => esc_html__( 'Primary', 'epfl' ),
+			'primary' => esc_html__( 'Primary', 'epfl' ),
 		) );
 
 		/*
@@ -264,4 +264,18 @@ function get_archives_link_mod ( $link_html ) {
 /**
  * enable excerpts for pages
  */
-add_post_type_support( 'page', 'excerpt' );
+add_post_type_support( 'page', 'excerpt' );
+
+/**
+ * get_current_menu_slug
+ * returns the slug of the current menu occupying the primary theme_location
+ * also works when using polylang
+ *
+ * @return string
+ */
+function get_current_menu_slug() {
+	$theme_location = 'primary';
+  $menu_locations = get_nav_menu_locations();
+  $menu_term = get_term($menu_locations[$theme_location], 'nav_menu');
+	return $menu_term;
+}

header.php

@@ -33,7 +33,7 @@
 				wp_nav_menu( array(
 					'menu_class'=> 'nav-header d-none d-xl-flex',
 					'container' => 'ul',
-					'depth' => 1,
+					'depth' => 1
 				) );
 			?>
 
@@ -45,7 +45,7 @@
 					</span>
 				</div>
 				<input type="text" class="form-control" placeholder="Rechercher">
-			</div>  
+			</div>
 		</form>
 
 	<?php get_template_part( 'template-parts/language-switcher' ) ?>
@@ -61,4 +61,4 @@
 
 </header>
 
-<div class="main-container">
+<div class="main-container">

index.php

@@ -37,7 +37,7 @@
 					endwhile; // End of the loop.
 				else : ?>
 						<h2>
-							<?php echo esc_html__( 'Aucun article trouvé', 'epfl-shortcodes' ) ?>
+							<?php esc_html_e( 'No article found', 'epfl' ) ?>
 						</h2>
 				<?php endif; ?>
 				</div>
@@ -51,4 +51,4 @@
 <!-- nav-toggle -->
 
 	<?php
-get_footer();
+get_footer();