Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Merge requests
!1
Bootstrap4
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Bootstrap4
bootstrap4
into
master
Overview
10
Commits
2
Pipelines
0
Changes
8
Merged
Tom Teichler
requested to merge
bootstrap4
into
master
5 years ago
Overview
10
Commits
2
Pipelines
0
Changes
8
Expand
0
0
Merge request reports
Compare
master
version 8
dd39aa56
5 years ago
version 7
180c8efc
5 years ago
version 6
0f2ff86b
5 years ago
version 5
c81428ea
5 years ago
version 4
e92494a1
5 years ago
version 3
38935c29
5 years ago
version 2
c0ceda00
5 years ago
version 1
0e30ec4c
5 years ago
master (base)
and
latest version
latest version
a6fec404
2 commits,
5 years ago
version 8
dd39aa56
2 commits,
5 years ago
version 7
180c8efc
1 commit,
5 years ago
version 6
0f2ff86b
3 commits,
5 years ago
version 5
c81428ea
2 commits,
5 years ago
version 4
e92494a1
1 commit,
5 years ago
version 3
38935c29
7 commits,
5 years ago
version 2
c0ceda00
7 commits,
5 years ago
version 1
0e30ec4c
6 commits,
5 years ago
8 files
+
81
−
25
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
8
Search (e.g. *.vue) (Ctrl+P)
biscuit/core/templates/core/base.html
+
13
−
16
Options
{% extends "bootstrap
3
/bootstrap
3
.html" %}
{% load bootstrap
3
menu staticfiles %}
{% extends "bootstrap
4
/bootstrap
4
.html" %}
{% load bootstrap
4
menu staticfiles
font_awesome any_js
%}
{% block bootstrap
3
_title %}BiscuIT School Information System{% endblock %}
{% block bootstrap
4
_title %}BiscuIT School Information System{% endblock %}
{% block bootstrap3_extra_head %}
{% block bootstrap4_extra_head %}
{% include_css "DataTables" %}
<link
rel=
"stylesheet"
href=
"{% static 'style.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"https://cdn.datatables.net/v/bs/dt-1.10.18/datatables.min.css"
/>
<link
rel=
"shortcut icon"
href=
"#"
/>
{% endblock %}
{% block bootstrap
3
_extra_script %}
<script
type=
"text/javascript"
src=
"https://cdn.datatables.net/v/bs/dt-1.10.18/d
ata
t
ables
.min.js"
></script>
{% block bootstrap
4
_extra_script %}
{% include_js "D
ata
T
ables
" %}
<script
type=
"text/javascript"
src=
"{% static 'js/main.js' %}"
/></script>
{% endblock %}
{% block bootstrap3_content %}
<nav
class=
"navbar navbar-default"
>
<div
class=
"container-fluid"
>
<div
class=
"navbar-header page-scroll"
>
<button
type=
"button"
class=
"navbar-toggle"
data-toggle=
"collapse"
data-target=
"#navbar-main"
>
<span
class=
"sr-only"
>
Toggle navigation
</span>
<span
class=
"glyphicon glyphicon-th-list"
></span>
{% block bootstrap4_content %}
<nav
class=
"navbar navbar-light bg-light navbar-expand-md"
>
<button
type=
"button"
class=
"navbar-toggler"
data-toggle=
"collapse"
data-target=
"#navbar-main"
>
{% fa 'fa-align-justify' %}
</button>
<a
class=
"navbar-brand"
href=
"{% url "
index
"
%}"
>
<span
class=
"glyphicon glyphicon-briefcase"
></span>
BiscuIT School Information System
@@ -29,8 +26,8 @@
<div
class=
"collapse navbar-collapse"
id=
"navbar-main"
>
{% generate_menu %}
<ul
class=
"nav navbar-nav
navbar-right
"
>
{% with menu=menus.main %}{% include "bootstrap-navbar.html" %}{% endwith %}
<ul
class=
"nav navbar-nav
ml-auto
"
>
{% with menu=menus.main %}{% include "bootstrap
4
-navbar.html" %}{% endwith %}
</ul>
</div>
</div>
Loading