Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vimazeno/blog.limos.fr
  • matrossevi/blog.limos.fr
  • borlonjo/blog.limos.fr
3 results
Show changes
<!-- Sidebar --> <!-- Sidebar -->
<section class="well well-sm"> <section class="well well-sm">
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
{% include 'includes/sidebar/search.html' %} {% include 'includes/sidebar/oim.html' %}
{#% include 'includes/sidebar/search.html' %#}
{% include 'includes/sidebar/optional_top.html' ignore missing %} {% include 'includes/sidebar/optional_top.html' ignore missing %}
{% include 'includes/sidebar/research.html' %}
{% include 'includes/sidebar/social.html' %} {% include 'includes/sidebar/social.html' %}
{% include 'includes/sidebar/recent_posts.html' %} {% include 'includes/sidebar/recent_posts.html' %}
{% include 'includes/sidebar/categories.html' %} {% include 'includes/sidebar/categories.html' %}
{% include 'includes/sidebar/tag_cloud.html' %}
{% include 'includes/sidebar/series.html' %} {% include 'includes/sidebar/series.html' %}
{% include 'includes/sidebar/github.html' %} {% include 'includes/sidebar/github.html' %}
{% include 'includes/sidebar/twitter_timeline.html' %} {% include 'includes/sidebar/twitter_timeline.html' %}
{% include 'includes/sidebar/links.html' %} {% include 'includes/sidebar/links.html' %}
{% include 'includes/sidebar/images.html' %} {% include 'includes/sidebar/images.html' %}
{% include 'includes/sidebar/tag_cloud.html' %}
{% include 'includes/sidebar/optional_bottom.html' ignore missing %} {% include 'includes/sidebar/optional_bottom.html' ignore missing %}
</ul> </ul>
</section> </section>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<li class="list-group-item"> <li class="list-group-item">
<h4> <h4>
<i class="fa fa-link" aria-hidden="true"></i> <i class="fa fa-link" aria-hidden="true"></i>
{{ title(_('Links'), DISABLE_SIDEBAR_TITLE_ICONS, icon='external-link-square') }} {{ title(_('Recherche'), DISABLE_SIDEBAR_TITLE_ICONS, icon='external-link-square') }}
</h4> </h4>
<ul class="list-group" id="links"> <ul class="list-group" id="links">
{% for icon, name, link in LINKS %} {% for icon, name, link in LINKS %}
......
<li class="list-group-item search">
<div>
<img src="{{ SITEURL }}/{{ OIMPHOTO }}" style="background: none" />
</div>
</li>
{% if RESEARCH %}
{% from 'includes/sidebar/macros.jinja' import title %}
<!-- Sidebar/Research -->
<li class="list-group-item">
<h4>
<i class='fa fa-flask' aria-hidden='true'></i>
{{ title(_('Recherche'), DISABLE_SIDEBAR_TITLE_ICONS) }}
</h4>
<ul class="list-group" id="research">
{% for icon, style, name, link in RESEARCH %}
<li class="list-group-item">
<img src="{{ icon }}" style="{{ style }}" />
<a href="{{ link }}">
{{ name }}
</a></li>
{% endfor %}
</ul>
</li>
<!-- End Sidebar/Research -->
{% endif %}
...@@ -4,12 +4,16 @@ ...@@ -4,12 +4,16 @@
<!-- Sidebar/Social --> <!-- Sidebar/Social -->
<li class="list-group-item"> <li class="list-group-item">
<h4> <h4>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> <i class="fa fa-user" aria-hidden="true"></i>
{{ title(_('Social'), DISABLE_SIDEBAR_TITLE_ICONS) }} {{ title(_('Social'), DISABLE_SIDEBAR_TITLE_ICONS) }}
</h4> </h4>
<ul class="list-group" id="social"> <ul class="list-group" id="social">
{% for icon, name, link in SOCIAL %} {% for icon, name, link in SOCIAL %}
{% if icon == "linkedin" %}
<li class="list-group-item"><a href="{{ link }}"><i class="fab fa-linkedin"></i> {{ name }}</a></li>
{% else %}
<li class="list-group-item"><a href="{{ link }}"><i class="fa fa-{{ icon }}"></i> {{ name }}</a></li> <li class="list-group-item"><a href="{{ link }}"><i class="fa fa-{{ icon }}"></i> {{ name }}</a></li>
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</a> </a>
<ul class="list-group {% if DISPLAY_TAGS_INLINE %}list-inline tagcloud{% endif %}" id="tags"> <ul class="list-group {% if DISPLAY_TAGS_INLINE %}list-inline tagcloud{% endif %}" id="tags">
{% for tag in tags %} {% for tag in tags %}
<li class="list-group-item tag-{{ tag.1 }}"> <li class="list-group-item"><!-- tag-{{ tag.1 }}" -->
<a href="{{ SITEURL }}/{{ tag.0.url }}"> <a href="{{ SITEURL }}/{{ tag.0.url }}">
<i class="fa fa-tag" aria-hidden="true"></i> &nbsp; {{- tag.0 -}} <i class="fa fa-tag" aria-hidden="true"></i> &nbsp; {{- tag.0 -}}
&nbsp; <span class="badge">{{- tag.2 -}}</span> &nbsp; <span class="badge">{{- tag.2 -}}</span>
......
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
{% if article.translations %} {% if article.translations %}
<span class="label label-default">{{ _('Lang') }}</span> <span class="label label-default">{{ _('Lang') }}</span>
{% for translation in article.translations %} {% for translation in article.translations %}
{% if translation.lang == ROOT_LANG %}
<a href="/{{ translation.url[6:] }}">{{ translation.lang }}</a>
{% else %}
<a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a> <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
{% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
{% block content %} {% block content %}
<section id="content" class="body"> <section id="content" class="body">
{% if page.title %} {#% if page.title %}
<h1 class="entry-title">{{ page.title }}</h1> <h1 class="entry-title">{{ page.title }}</h1>
{% endif %} {% endif %#}
{% import 'includes/translations.html' as translations with context %} {% import 'includes/translations.html' as translations with context %}
{{ translations.translations_for(page) }} {{ translations.translations_for(page) }}
{% if PDF_PROCESSOR %} {% if PDF_PROCESSOR %}
......
vboxmanage import ~/Documents/kali.ova
vboxmanage import ~/Documents/dvwa.ova
vboxmanage import ~/Documents/debian.ova
vboxmanage import ~/Documents/proxy.ova
vboxmanage import ~/Documents/thenetwork.ova
vboxmanage modifyvm kali --nic1 natnetwork --nat-network1 natwebsec
vboxmanage modifyvm dvwa --nic1 natnetwork --nat-network1 natwebsec
vboxmanage modifyvm debian --nic1 natnetwork --nat-network1 natwebsec
vboxmanage modifyvm proxy --nic1 natnetwork --nat-network1 natwebsec
vboxmanage modifyvm thenetwork --nic1 natnetwork --nat-network1 natwebsec
\ No newline at end of file