Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
attendance
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wp
attendance
Merge requests
!157
Redesign accreditation subjects
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Redesign accreditation subjects
task/redesign_accreditation_subjects_2
into
dev
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Паноска Маја
requested to merge
task/redesign_accreditation_subjects_2
into
dev
8 months ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
Placed the add subject and import file buttons above the filter
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
553315c9
1 commit,
8 months ago
1 file
+
9
−
8
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/main/resources/templates/joinedsubject/listJoinedSubjects.html
+
9
−
8
Options
@@ -11,10 +11,15 @@
<div
class=
"container mt-4"
>
<h1>
Предмети со акредетација
</h1>
<!-- Button to trigger Import Modal -->
<button
type=
"button"
class=
"btn btn-primary mb-4"
data-toggle=
"modal"
data-target=
"#importModal"
>
Внеси предмети
</button>
<div
class=
"d-flex align-items-center mb-4 mt-4"
>
<button
type=
"button"
class=
"btn btn-primary mr-2"
data-toggle=
"modal"
data-target=
"#importModal"
>
Внеси предмети
</button>
<a
href=
"/joinedSubjects/add"
class=
"btn btn-success"
>
Додади нов предмет
</a>
</div>
<!-- Import Modal -->
<div
class=
"modal fade"
id=
"importModal"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"importModalLabel"
aria-hidden=
"true"
>
@@ -74,10 +79,6 @@
</form>
</div>
<div>
<a
href=
"/joinedSubjects/add"
class=
"btn btn-success mb-3"
>
Додади нов предмет
</a>
</div>
<table
class=
"table table-striped"
>
<thead>
<tr
class=
"text-center"
>
Loading