Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Hiboo
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cyrinux
Hiboo
Commits
722a226b
Verified
Commit
722a226b
authored
5 months ago
by
ornanovitch
Browse files
Options
Downloads
Patches
Plain Diff
fix(ui): fix missing pieces of bootstrap 5 migration
parent
90b384d5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hiboo/profile/templates/profile_pick.html
+30
-40
30 additions, 40 deletions
hiboo/profile/templates/profile_pick.html
hiboo/profile/templates/profile_quick.html
+15
-18
15 additions, 18 deletions
hiboo/profile/templates/profile_quick.html
with
45 additions
and
58 deletions
hiboo/profile/templates/profile_pick.html
+
30
−
40
View file @
722a226b
...
...
@@ -11,44 +11,34 @@
{% block content %}
<div
class=
"row"
>
{% for profile in profiles %}
<div
class=
"col-xs col-md-6 col-lg-4"
>
<div
class=
"card"
>
<div
class=
"card-header bg-{{ macros.colors[loop.index0 % 7] }}"
>
<div
class=
"float-right"
>
{% if profile.status == profile.ACTIVE %}
<form
method=
"POST"
action=
"{{ utils.url_or_intent("
account.home
")
}}"
class=
"form"
>
{{ form.hidden_tag() }}
<input
type=
"hidden"
name=
"profile_uuid"
value=
"{{ profile.uuid }}"
/>
<input
type=
"submit"
value=
"{% trans %}Sign in{% endtrans %}"
class=
"btn btn-lg btn-flat bg-gray text-black"
/>
</form>
{% else %}
<span
class=
"btn btn-lg btn-flat bg-secondary text-black"
>
{{ profile.STATUSES[profile.status][1] | capitalize }}
</span>
{% endif %}
</div>
<h3
class=
"widget-header-username"
>
{{ profile.username }}
</h3>
{% if profile.comment %}
<h5>
{{ profile.comment }}
</h5>
{% else %}
<h5>
{% trans %}No profile description{% endtrans %}
</h5>
{% endif %}
</div>
<div
class=
"card-footer p-0"
>
<ul
class=
"nav flex-column"
>
{% set created_on = profile.created_at.date() %}
<li
class=
"nav-item"
>
<a
href=
"#"
class=
"nav-link"
>
{% trans %}Created on {{ created_on }}{% endtrans %}
</a>
</li>
<li
class=
"nav-item"
>
<a
href=
"#"
class=
"nav-link"
>
{% trans %}Not shared with anyone{% endtrans %}
</a>
</li>
</ul>
</div>
<div
class=
"col-xs col-md-6 col-lg-4"
>
<div
class=
"card"
>
<div
class=
"card-header"
style=
"background-color: var(--bs-{{ macros.colors[loop.index0 % 7] }}"
>
<h3>
{{ profile.username }}
</h3>
{% if profile.comment %}
<h5>
{{ profile.comment }}
</h5>
{% endif %}
{% set created_on = profile.created_at.date() %}
{% trans %}Created on {{ created_on }}{% endtrans %}
</div>
<div
class=
"card-body"
>
{% if profile.status == profile.ACTIVE %}
<form
method=
"POST"
action=
"{{ utils.url_or_intent("
account.home
")
}}"
class=
"form"
>
{{ form.hidden_tag() }}
<input
type=
"hidden"
name=
"profile_uuid"
value=
"{{ profile.uuid }}"
/>
<input
type=
"submit"
value=
"{% trans %}Sign in{% endtrans %}"
class=
"btn btn-lg btn-outline-success"
/>
</form>
{% else %}
<button
disabled
class=
"btn btn-lg"
>
{{ profile.STATUSES[profile.status][1] | capitalize }}
</button>
{% endif %}
</div>
</div>
</div>
{% endfor %}
</div>
{% endblock %}
...
...
@@ -56,15 +46,15 @@
{% block actions %}
{% if service.policy not in ("locked",) %}
<a
href=
"{{ utils.url_for("
.
claim
",
intent=
True)
}}"
class=
"btn btn-primary"
>
{% trans %}Claim a profile{% endtrans %}
</a>
class=
"btn btn-
outline-
primary"
>
{% trans %}Claim a profile{% endtrans %}
</a>
{% endif %}
{% if service.policy in ("open", "burst") and profiles.__len__()
<
service.max_profiles
%}
<
a
href=
"{{ utils.url_for("
.
create
",
intent=
True)
}}"
class=
"btn btn-success"
>
{% trans %}Create another profile{% endtrans %}
</a>
class=
"btn btn-
outline-
success"
>
{% trans %}Create another profile{% endtrans %}
</a>
{% elif service.policy in ("managed", "burst") %}
<a
href=
"{{ utils.url_for("
.
create
",
intent=
True)
}}"
class=
"btn btn-warning"
>
{% trans %}Request another profile{% endtrans %}
</a>
class=
"btn btn-
outline-
warning"
>
{% trans %}Request another profile{% endtrans %}
</a>
{% else %}
<a
href=
"#"
class=
"btn btn-success"
disabled
>
{% trans %}Create another profile{% endtrans %}
</a>
<a
href=
"#"
class=
"btn btn-
outline-
success"
disabled
>
{% trans %}Create another profile{% endtrans %}
</a>
{% endif %}
{% endblock %}
This diff is collapsed.
Click to expand it.
hiboo/profile/templates/profile_quick.html
+
15
−
18
View file @
722a226b
...
...
@@ -12,38 +12,35 @@
{% block content %}
<div
class=
"row"
>
<div
class=
"col-xs col-md-6 col-lg-4"
>
<div
class=
"card card-widget widget-user-2"
>
<div
class=
"widget-user-header bg-primary"
>
<div
class=
"float-right"
>
<form
method=
"POST"
class=
"form"
>
{{ form.hidden_tag() }}
<input
type=
"hidden"
name=
"username"
value=
"{{ form.username.data }}"
/>
<input
type=
"submit"
value=
"{% trans %}Sign up{% endtrans %}"
class=
"btn btn-lg btn-flat bg-gray text-black"
/>
</form>
</div>
<h3
class=
"widget-header-username"
>
{{ form.username.data }}
</h3>
<h5
class=
"widget-header-desc"
>
{% trans service_name %}Your new {{ service_name }} profile{% endtrans %}
</h5>
<div
class=
"card"
>
<div
class=
"card-header bg-light-subtle"
>
<h3>
{{ form.username.data }}
</h3>
<h5>
{% trans service_name %}Your new {{ service_name }} profile{% endtrans %}
</h5>
</div>
<div
class=
"card-
footer
"
>
<div
class=
"card-
body
"
>
<p>
{% trans service_name %}Please click the "Sign up" button to initialize your {{ service_name }} account.{% endtrans %}
</p>
{% if not service.single_profile %}
<p>
{% trans %}If you wish to pick a different username, please click the "Custom profile" button.{% endtrans %}
</p>
<p>
{% trans %}If you wish to pick a different username, please click the "C
reate a c
ustom profile" button.{% endtrans %}
</p>
{% endif %}
<form
method=
"POST"
class=
"form text-center"
>
{{ form.hidden_tag() }}
<input
type=
"hidden"
name=
"username"
value=
"{{ form.username.data }}"
/>
<input
type=
"submit"
value=
"{% trans %}Sign up{% endtrans %}"
class=
"btn btn-lg btn-outline-success"
/>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
{% block actions %}
{% if service.policy not in ("locked",) %}
<a
href=
"{{ utils.url_for("
.
claim
")
}}"
class=
"btn btn-primary"
>
{% trans %}Claim a profile{% endtrans %}
</a>
<a
href=
"{{ utils.url_for("
.
claim
")
}}"
class=
"btn btn-
outline-
primary"
>
{% trans %}Claim a profile{% endtrans %}
</a>
{% endif %}
{% if not service.single_profile %}
<a
href=
"{{ utils.url_for("
.
create
")
}}"
class=
"btn btn-success"
>
{% trans %}Create a custom profile{% endtrans %}
</a>
<a
href=
"{{ utils.url_for("
.
create
")
}}"
class=
"btn btn-
outline-
success"
>
{% trans %}Create a custom profile{% endtrans %}
</a>
{% endif %}
{% endblock %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment