Compare revisions

Andre Maroneze · David Bühler · Augustin Lemesle · Allan Blanchard · David Bühler · Augustin Lemesle
--- a/_includes/sidebar_blog.html
+++ b/_includes/sidebar_blog.html
@@ -16,12 +16,18 @@
 	  <h4>Tags</h4>
 	  <nav>
-		 {% for category in site.categories %}
+	    {% for category in include.cats %}
-		{% if page.paginator and page.title == category[0] %}
+		<a href="/category/{{ category | downcase }}/index.html" class="btn btnCancel active"><span>{{ category }}</span></a>
+		{% endfor %}
+		{% for category in site.categories %}
+		{% unless include.cats contains category[0] %}
+		{% if page.title == category[0] %}
 		<a href="/category/{{ category[0] | downcase }}/index.html" class="btn btnCancel active"><span>{{ category[0] }}</span></a>
 		{% else %}
 		<a href="/category/{{ category[0] | downcase }}/index.html" class="btn btnCancel"><span>{{ category[0] }}</span></a>
 		{% endif %}
+		{% endunless %}
 		{% endfor %}
 	  </nav>
 	</div>

--- a/_layouts/job.html
+++ b/_layouts/job.html
@@ -9,9 +9,6 @@ css: careers
    <div id="container" class="mainContainer">
      <div class="careerDetail pages pageDetail">
-        <div class="bgTextbig">
-          CAREERS
-        </div>
        <div class="wrap">
          <a class="goBack" href="/html/careers.html"><i class="icon-arrow-left"></i>Careers</a>

--- a/_layouts/plugin.html
+++ b/_layouts/plugin.html
@@ -18,9 +18,6 @@ css: plugin
        </div>
        <div class="pages">
-          <div class="bgTextbig">
-            Plugins
-          </div>
          <div class="wrap">
 			<h2 class="subTitle">{{ page.title }}</h2>

--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,47 +4,61 @@ layout: default
  <div id="wrapper" class="hfeed">
-	{% include headers.html %}
+	{% include headers.html header=5 title=Blog %}
    <div id="container" class="mainContainer">
      <div class="defaultPage blogsPage singleBlogPage" id="content" role="main">
        <div class="contentWrap">
-          <!-- Note: currently the 'back' button returns to the blog home,
+            <div class="breadcrumb backNavigation">
-               so it is disabled for now <div class="breadcrumb backNavigation">
+            <a href="/blog/index.html" class="backLink2"><i class="icon icon-arrow-left"></i> Back to blogs</a>
-            <a href="/blog/index.html" class="backLink2"><i class="icon icon-arrow-left"></i> Back to blogs</a>-->
-            <div class="blogNav">
-              {% if page.previous.url %}
-              <span class="blogNavPost"><a class="prevPost" href="{{page.previous.url}}">&larr; {{page.previous.title}}</a>
-              {% endif %}
-                {% if page.previous.url and page.next.url %}
-                -
-                {% endif %}
-              {% if page.next.url %}
-              <span class="blogNavPost"><a class="nextPost" href="{{page.next.url}}">{{page.next.title}} &rarr;</a></span>
-              {% endif %}
-            </div>
          </div>
-          <h1 id="blogPostTitle"><span>{{ page.title }}</span></h1>
-          <address class="blogPostAddress">
-          {{ page.author }} - {{ page.date | date_to_string: "ordinal" }} - {{ page.categories | array_to_sentence_string: "" }}
-          </address>
        </div>
        <div class="contentWrap">
          <div class="blogsSection">
            <div class="blogsSectionContent singleBlog">
+			  <div class="imageBlogPage" style=
+				"background-image: url({% if page.image %}{{ page.image }}{% else %}/assets/img/default-blog.jpg{% endif %});">
+			  </div>
              <article>
+                <div class="blogNav">
+				  {% if page.previous.url %}
+				  <span class="blogNavPost left"><a class="prevPost" href="{{page.previous.url}}">&larr; {{ page.previous.title }}</a></span>
+				  {% endif %}
+				  {% if page.next.url %}
+				  <span class="blogNavPost right"><a class="nextPost" href="{{page.next.url}}">{{page.next.title }} &rarr;</a></span>
+				  {% endif %}
+				</div>
+				<h1 id="blogPostTitle"><span>{{ page.title }}</span></h1>
+				<address class="blogPostAddress">
+				{{ page.author }} - {{ page.date | date_to_string: "ordinal" }}
+				</address>
                <div class="content">
                  {{ content }}
                </div>
              </article>
+			<address class="blogPostAddress" style="text-align: right;">
+			{{ page.author }}
+			<br>{{ page.date | date_to_string: "ordinal" }}
+			</address>
+			<br>
+			<div class="blogNav">
+			  {% if page.previous.url %}
+			  <span class="blogNavPost left"><a class="prevPost" href="{{page.previous.url}}">&larr; {{ page.previous.title }}</a></span>
+			  {% endif %}
+			  {% if page.next.url %}
+			  <span class="blogNavPost right"><a class="nextPost" href="{{page.next.url}}">{{ page.next.title }} &rarr;</a></span>
+			  {% endif %}
+			</div>
            </div>
-            {% include sidebar_blog.html %}
+            {% include sidebar_blog.html cats=page.categories %}
          </div>
        </div>
      </div>
+			{% include footer.html %}
    </div>
  </div>
--- a/assets/css/blog.css
+++ b/assets/css/blog.css
@@ -558,9 +558,6 @@
 .singleBlogPage .content h5 {
  font-size: 1.2em;
 }
-.singleBlogPage .content p {
-  margin: 1.6em 0;
-}
 .singleBlogPage .content a {
  border-bottom: 1px solid;
  transition: all 0.35s;
@@ -761,10 +758,6 @@ p code {
  padding: 1px 5px;
  font-size: smaller;
 }
-.singleBlogPage {
-    min-height: 0;
-    padding-bottom: 0;
-}
 #blogPostTitle {
    text-align: center;
 }
@@ -773,5 +766,24 @@ p code {
 }
 .blogNavPost {
    font-style: italic;
-    display: inline-block;
+    /* display: inline-block; */
 }
+.blogNav {
+  /* display: inline-block; */
+  padding-bottom: 15px;
+}
+.blogNavPost.right{
+  float:right;
+}
+.blogNavPost.right{
+  float:right;
+}
+.imageBlogPage {
+  background-size: cover;
+  height: 15em;
+  margin-bottom: 1em;
+}
\ No newline at end of file
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -1499,18 +1499,6 @@ h2 {
    margin: 0 0.25% 0.5%;
    box-sizing: border-box;
  }
-  .docListwrap > section > div:nth-child(4),
-  .docListwrap > section .listItem:nth-child(4),
-  .docListwrap > section > div:nth-child(5),
-  .docListwrap > section .listItem:nth-child(5) {
-    width: 49.25%;
-  }
-  .docListwrap > section > div:nth-child(4) h3:before,
-  .docListwrap > section .listItem:nth-child(4) h3:before,
-  .docListwrap > section > div:nth-child(5) h3:before,
-  .docListwrap > section .listItem:nth-child(5) h3:before {
-    left: 20%;
-  }
  .docListwrap > section > div:nth-child(4):nth-last-child(1),
  .docListwrap > section .listItem:nth-child(4):nth-last-child(1) {
    width: 32.66%;

--- a/dokuwiki/bug_reporting_guidelines.md
+++ b/dokuwiki/bug_reporting_guidelines.md
 ---
 layout: clean_page
+title: Bug reporting
 ---
-# Using the Bug Tracking System
+# Report an issue with Frama-C
-  - You must have an account to report an issue on the [Bug Tracking
+To report an issue, You must either create an account on the
-    System (BTS)](http://bts.frama-c.com/view_all_bug_page.php). If you
+[GitLab of Frama-C](https://git.frama-c.com/), or use your Github
-    are creating your account for your first bug report, consider this
+account. The reporting is done through the
-    trade-off carefully: we will never use your e-mail address to
+[issue tracking system](https://git.frama-c.com/pub/frama-c/issues).
-    contact you for something other than the bug you reported. But if
-    you provide an invalid e-mail address, your bug may linger for
+If you are creating your account for your first bug report, consider
-    months because the assignee is waiting for more feedback and you
+this trade-off carefully: we will never use your e-mail address to
-    didn't receive the notice.
+contact you for something other than the bug you reported. But if you
+provide an invalid e-mail address, your bug may linger for months
-<!-- end list -->
+because the assignee is waiting for more feedback and you didn't
+receive the notice.
-  - Use English to report an issue on the BTS. Using French is also
-    acceptable to report a **private** issue.
+The menu "Choose a template" provides a template "bug_report" that
+you just have to fill in. 
-<!-- end list -->
+Some advices to post your issue:
-  - Whenever possible, include **HOW TO REPRODUCE** the issue. Provide
-    everything necessary for a smart, but not mind-reading, human to
+- Use English to report an issue. Using French is also acceptable to
-    reproduce the bug: input files, command line used, sequence of
+  report a **private** issue.
-    actions. If your analysis project depends on system headers, please
+- If the bug report is not for a crash, include the **EXPECTED
-    use one of the two options from [this
+  BEHAVIOR** that you would have liked to see.
-    message](http://lists.gforge.inria.fr/pipermail/frama-c-discuss/2008-December/000831.html).
+- Include the **OBTAINED BEHAVIOR** in enough detail that someone else
+  (smart, but not mind-reading) can decide if they have reproduced
-<!-- end list -->
+  your bug.
+- Include **HOW TO REPRODUCE** the issue. Provide everything necessary
-  -  If possible, attach the automatically-generated journal (by default
+  for a smart, but not mind-reading, human to reproduce the bug: input
-    called `frama_c_journal.ml`). Journals are enabled automatically
+  files, command line used, sequence of actions. If your analysis
-    when you use the GUI, or when using option `-journal-enable`.
+  project depends on system headers, please use one of the two following
-    Including a journal or a backtrace when available does not exempt
+  options to be sure that:
-    you from providing the input files: a backtrace or a journal alone
+    - (Preferred) Use the option `-print` of Frama-C
-    do not contain enough information to reproduce the behavior.
+      ```
+      $ frama-c ./your_files*.c -ocode result.c
-<!-- end list -->
+      ```
+    - Use the preprocessor (Note however that this second option will
-  - Include the **OBTAINED BEHAVIOR** in enough detail that someone else
+      drop ACSL annotations, using `-CC` keeps all comments):
-    (smart, but not mind-reading) can decide if they have reproduced
+      ```
-    your bug.
+      $ gcc -C -E -I . original.c > result.i
+      ```
-<!-- end list -->
+The status of an issue may be one of the following:
-  - Include the **CATEGORY**, that is which part of Frama-C is concerned
-    by your bug report or feature request. Note that issues related to
+- new: the issue has not been yet considered by any Frama-C developer.
-    Why, including issues with Why's Graphical User Interface, must be
+- assigned: the issue has been assigned to a Frama-C developer. However the
-    classified in the category "Plug-in \> Jessie" (and not in the
+  assignee has not yet considered this issue.
-    category "Graphical User Interface" which is only relevant for
+- confirmed: the issue has been confirmed by the assignee (or by any Frama-C
-    issues specific to Frama-c's GUI).
+  developer if there is no assignee). It is really a bug or a wished feature.
+- resolved: the issue has been fixed by the assignee. The Frama-C development
-<!-- end list -->
+  version contains the patch which will be part of a future release.
+- closed: the issue is no more relevant. Either it is not really a bug or a
-  - If the bug report is not for a crash, include the **EXPECTED
+  wished feature, or it is fixed in a public release available from the
-    BEHAVIOR** that you would have liked to see.
+  [download page of Frama-C](/html/get-frama-c.html).
-<!-- end list -->
-  - The status of an issue may be one of the following:
-      - **new** (lightred): the issue has not been yet considered by any
-        Frama-C developer.
-      - **assigned** (mauve): the issue has been assigned to a Frama-C
-        developer (automatically or manually by another Frama-C
-        developer). However the assignee has not yet considered this
-        issue.
-      - **acknowledged** (orange): the issue has been considered by the
-        assignee (or by any Frama-C developer if there is no assignee)
-        but not yet deeply investigated.
-      - **confirmed** (yellow): the issue has been confirmed by the
-        assignee (or by any Frama-C developer if there is no assignee).
-        It is really a bug or a wished feature.
-      - **resolved** (lightgreen): the issue has been fixed by the
-        assignee. The Frama-C development version contains the patch
-        which will be part of a future release.
-      - **closed** (lightgray): the issue is no more relevant. Either it
-        is not really a bug or a wished feature, or it is fixed in a
-        public release available from [the download
-        page](http://frama-c.cea.fr/download.html) of Frama-C.
-      - **feedback** (magenta): the issue was previously considered
-        resolved or closed but has been reopened.
-<!-- end list -->
-  - Remark: the **feedback** status is also used when the assignee
-    requires additional information from the reporter.
--- a/html/acsl.html
+++ b/html/acsl.html
@@ -19,9 +19,6 @@ title: ACSL
      </div>
      <div class="pageKernel pages">
-        <div class="bgTextbig">
-          ACSL
-        </div>
        <div class="wrap">
          <h1>ANSI/ISO C Specification Language</h1>

--- a/html/careers.html
+++ b/html/careers.html
@@ -11,9 +11,6 @@ title: Careers at Frama-C
    <div id="container" class="mainContainer">
      <div class="pageCareers pages">
-        <div class="bgTextbig">
-          CAREERS
-        </div>
        <div class="wrap">
          <h1 class="pageTitle">CAREERS</h1>
@@ -29,7 +26,7 @@ title: Careers at Frama-C
 			{% for job in site.jobs %}
 				<a class="listItem" href="{{ job.url }}">
-				<h4 class="listItemTitle" data-bgtext="{{ job.title }}">{{ job.title }}</h4>
+				<h4 class="listItemTitle">{{ job.title }}</h4>
 				<p>Job ID: {{ job.job_id }}<br>
 				Posted: {{ job.date | date_to_string }}<br>

--- a/html/contact.html
+++ b/html/contact.html
@@ -98,7 +98,7 @@ function(err, data) {
 		</div>
 		<div class="description">
-		    The official Frama-C issues on its Gitlab.
+		    The official Frama-C issues on its Gitlab (for bug reporting and feature requests).
 		</div>
        </a>
 	    </li>
@@ -131,13 +131,13 @@ function(err, data) {
        <div class="icon-com"><img src="/assets/img/community/gitlab.png"></div>
 	    <li class="icon_4">
-		  <a href="https://git.frama-c.com/pub/frama-c" target="_blank">
+		  <a href="https://git.frama-c.com/pub" target="_blank">
 			<div class="slideCaption">
 		    Frama-C on Gitlab
 			</div>
 			<div class="description">
-		    Frama-C snapshots and related code bases (Qed, open source case studies...).
+		    Frama-C development repositories (including daily snapshots and related code bases, such as open source case studies).
 			</div>
          </a>
 	    </li>

--- a/html/kernel-plugin.html
+++ b/html/kernel-plugin.html
@@ -31,9 +31,6 @@ title: Kernel & Plugins - Frama-C
      </div>
      <div class="pagePlugin pages">
-        <div class="bgTextbig">
-          Plugin
-        </div>
        <div class="wrap">
          <div class="docListwrap">
@@ -48,7 +45,7 @@ title: Kernel & Plugins - Frama-C
                                  plugin.distrib_mode == distrib.key %}
 				  <a role="link" href="{{ plugin.url }}" class="listItem">
 					<div>
-					  <h4 class="listItemTitle" data-bgtext="{{ plugin.title }}"><span>{{ plugin.title }}</span></h4>
+					  <h4 class="listItemTitle"><span>{{ plugin.title }}</span></h4>
 					  <p>{{ plugin.description }}</p>
                                          <p>{{ distrib.name }}</p>
 					</div>

--- a/html/kernel.html
+++ b/html/kernel.html
@@ -19,9 +19,6 @@ title: Kernel & Plugins - Frama-C
      </div>
      <div class="pageKernel pages">
-        <div class="bgTextbig">
-          Kernel
-        </div>
        <div class="wrap">
          <p>WIP (TA)</p>
No results found