Skip to content

Update bostonma theme to add account header and search bar #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jguo144 merged 2 commits into from
Apr 22, 2025
Merged

Update bostonma theme to add account header and search bar #100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d931097
Update bostonma theme to add account header and search bar
jguo144 Apr 16, 2025
da10e64
Display 'Go to resource' for linked resources in CA themes
jguo144 Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 6 additions & 100 deletions ckanext/opendata_theme/extended_themes/bostonma/assets/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ a[href^="/datastore/dictionary_download/"] {
.masthead .logo img {
max-height: 20px !important;
}
.masthead .site-search {
padding-top: 0;
}
.account.avatar.authed a[href="/blog"],
.account.avatar.authed a[href="/contact"] {
display: none;
Expand All @@ -18,9 +21,6 @@ a[href^="/datastore/dictionary_download/"] {
float: right !important;
padding: 5px 0;
}
.compressed.masthead .account-masthead {
margin-top: 5px;
}
.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
max-width: unset !important;
width: 100% !important;
Expand All @@ -32,9 +32,6 @@ a[href^="/datastore/dictionary_download/"] {
#dataset-map .module-heading .action {
color: #ffffff;
}
#field-sitewide-search {
height: 26px;
}
#footer-attribution-content {
display: inline;
right: 20%
Expand All @@ -43,9 +40,6 @@ a[href^="/datastore/dictionary_download/"] {
max-height: 25px;
padding-right: 10px;
}
#page {
padding-top: 65px;
}
#twitter-widget-0, #twitter-widget-1 {
height: 620px !important;
}
Expand Down Expand Up @@ -140,11 +134,8 @@ header .header-image.navbar-left {
}
header.navbar.navbar-static-top.masthead {
box-shadow: 0 1px 2px 1px rgba(0,0,0,0.1);
position: fixed;
min-height: 65px;
width: 100%;
top: 0;
left: 0;
z-index: 100;
}
input, textarea, select {
Expand Down Expand Up @@ -212,35 +203,6 @@ ul.menu {
.accordion-toggle.collapsed h2.accordion-heading:after {
content: "\f078";
}
.account {
height: 48px;
}
.account ul {
height: 48px;
}
.account ul a:hover {
background-color: #126c9c;
}
.account li {
height: 48px;
display: inline-block;
}
.account-masthead .account ul li {
border-left: none;
}
.account-masthead .account.not-authed ul li a {
font-weight: normal;
}
.account-masthead .account ul li a:hover {
background: #469c23;
}
.account.avatar.authed ul, .account.not-authed ul {
padding-top: 0;
}
.account.avatar.authed ul a, .account.not-authed ul a {
padding: 14px 7px;
text-decoration: none;
}
.activity .item .date {
color: #767676;
}
Expand Down Expand Up @@ -636,13 +598,6 @@ input:-ms-input-placeholder {
.masthead {
background: #ffffff none;
}
.masthead input[type="text"] {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border: 0;
border-radius: 0;
color: black;
}
.masthead .btn-navbar,
.masthead .btn-navbar:hover, .masthead .btn-navbar:focus, .masthead .btn-navbar:active,
.masthead .btn-navbar.active, .masthead .btn-navbar.disabled, .masthead .btn-navbar[disabled] {
Expand Down Expand Up @@ -675,23 +630,6 @@ input:-ms-input-placeholder {
.masthead a.s:hover {
background-color: #fff;
}
.masthead .navigation {
margin-right: 0;
}
.masthead .section.site-search.simple-input {
float: right;
margin: 20px 0;
position: relative;
}
.masthead .site-search {
margin: 2px 2px 22px 0;
}
.masthead .site-search input {
background-color: transparent;
box-shadow: none;
padding: 4px 10px 4px 25px;
width: 144px;
}
.media-grid {
background: #fff none;
border: none;
Expand Down Expand Up @@ -927,9 +865,6 @@ header .navbar .nav>li>a {
font-weight: normal;
margin-bottom: 26px;
}
.section.site-search.simple-input [class^="icon-"] {
font-size: 20px;
}
.select2-container {
margin-top: 1px;
margin-bottom: 5px;
Expand Down Expand Up @@ -964,7 +899,6 @@ header .navbar .nav>li>a {
.site-footer,
.site-footer a,
.site-footer small {
background-color: #0c2639;
color: #51acff;
font-weight: 400;
font-size: 16px;
Expand All @@ -978,9 +912,6 @@ header .navbar .nav>li>a {
margin-bottom: 10px;
padding: 4px 6px;
}
.site-search.simple-input {
border: 1px solid rgb(205,205,205);
}
.spinner {
-webkit-animation: scaleout 1.0s infinite ease-in-out;
animation: scaleout 1.0s infinite ease-in-out;
Expand Down Expand Up @@ -1082,9 +1013,6 @@ fieldset.checkboxes label input {
.primary .nav.nav-tabs i {
display: none;
}
.masthead .site-search {
display: inline;
}
.nav .dropdown .dropdown-menu,
.js .dropdown:hover .dropdown-menu {
display: block;
Expand Down Expand Up @@ -1289,21 +1217,6 @@ fieldset.checkboxes label input {
}
}
@media (min-width: 980px) {
.account a {
display: inline-block;
}
.account li {
display: inline-block;
padding-top: 0;
}
.account.avatar.authed, .account.not-authed {
float: right;
margin-right: 34px;
}
.account.avatar.authed li, .account.not-authed li {
display: inline;
padding-top: 0;
}
.masthead .nav-collapse {
float: none;
padding: 0;
Expand Down Expand Up @@ -1516,14 +1429,15 @@ label.nav-trigger:after {
}
.main-navigation .main-navigation-title {
background: url(/img/b-logo-dark.svg) no-repeat center #fff;
background-color: #ffffff !important;
background-size: 54px 83px;
margin: 0;
padding: 112px;
text-align: center;
}
.main-navigation a {
background-color: #0075d1;
color: #fff;
color: #fff !important;
display: block;
font-family: "Montserrat", sans-serif;
font-weight: 700;
Expand Down Expand Up @@ -1600,11 +1514,6 @@ label.nav-trigger:after {
border: 1px solid #e3e3e3;
margin-left: 40px;
}
.main-navigation .account.avatar.authed ul a:hover,
.main-navigation .account.not-authed li.active a,
.main-navigation .account ul a:hover {
background-color: #175182;
}
.module-content.box {
padding: 20px;
}
Expand Down Expand Up @@ -1757,9 +1666,6 @@ footer.site-footer .container {
.site-footer .container .row {
padding-left: 40px;
}
.site-footer, .site-footer a, .site-footer small {
background-color: rgb(9,31,47);
}
.s {
background-color: #fff;
border-radius: 50%;
Expand Down Expand Up @@ -2114,6 +2020,7 @@ ul.media-grid.masonry {

.masthead, .masthead .navbar-collapse{
padding: 0;
margin-top: 0;
}

.navbar-static-top{
Expand All @@ -2124,7 +2031,6 @@ ul.media-grid.masonry {
display: none;
}

nav.not-authed a[href="/contact"],
#custom-footer-form .footer-column-form:nth-child(4) {
display: none !important;
}
Expand Down
81 changes: 19 additions & 62 deletions ckanext/opendata_theme/extended_themes/bostonma/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,28 @@
{% endif %}

{% block header_wrapper %}
<header class="navbar navbar-static-top masthead compressed">
{% block header_account %}
<div class="account-masthead">
<div class="container">
{% block header_account_container_content %}
{{ super() }}
{% endblock %}
</div>
</div>
{% endblock %}
<header class="navbar navbar-static-top masthead">
{% block header_debug %}
{{ super() }}
{% endblock %}
<div class="container">
{# The .header-image class hides the main text and uses image replacement for the title #}
<label tabindex="0" for="hb__trigger" class="nav-trigger" type="button" aria-label="Menu" aria-controls="navigation" aria-expanded="false">
<div class="hb">
<span class="hb__box">
<span class="hb__inner"></span>
</span>
<span class="hb__label">Menu</span>
</div>
<div class="hb">
<span class="hb__box">
<span class="hb__inner"></span>
</span>
<span class="hb__label">Menu</span>
</div>
</label>
<div class="{{ g.header_class }} navbar-left">
{% block header_logo %}
Expand All @@ -47,61 +56,6 @@
</button>
</div>
<div class="collapse navbar-collapse" id="main-navigation-toggle">
{% block header_account %}
<div class="account-masthead">
{% block header_account_container_content %}
{% if g.userobj %}
<div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
<ul class="list-unstyled unstyled">
{% block header_account_logged %}
{% if g.userobj.sysadmin %}
<li>
<a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
<i class="fa fa-gavel" aria-hidden="true"></i>
<span class="text">{{ _('Admin') }}</span>
</a>
</li>
{% endif %}
<li>
<a href="{{ h.url_for('user.read', id=g.userobj.name) }}" class="image" title="{{ _('View profile') }}">
{{ h.user_image((c.user if c and c.user else ''), size=22) }}
<span class="username">{{ h.opendata_theme_abbreviate_name(g.userobj.display_name) }}</span>
</a>
</li>
{% set new_activities = h.new_activities() %}
<li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
{% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities)
%}
<a href="{{ h.url_for('dashboard.index') }}" title="{{ notifications_tooltip }}">
<i class="fa fa-tachometer" aria-hidden="true"></i>
<span class="text">{{ _('Dashboard') }}</span>
<span class="badge">{{ new_activities }}</span>
</a>
</li>
{% block header_account_settings_link %}
{{ super() }}
{% endblock %}
{% block header_account_log_out_link %}
{{ super() }}
{% endblock %}
{% endblock %}
</ul>
</div>
{% else %}
<nav class="account not-authed" aria-label="{{ _('Account') }}">
<ul class="list-unstyled unstyled">
{% block header_account_notlogged %}
<li>{% link_for _('Log in'), named_route='user.login' %}</li>
{% if h.check_access('user_create') %}
<li>{% link_for _('Sign up'), named_route='user.register', class_='sub' %}</li>
{% endif %}
{% endblock %}
</ul>
</nav>
{% endif %}
{% endblock %}
</div>
{% endblock %}
{% block header_site_navigation %}
<nav class="section navigation">
<ul class="nav nav-pills">
Expand All @@ -116,6 +70,9 @@
<a href="/pages/ckan-training-videos">Tips</a>
</li>
{% endblock %}
{% block header_site_search %}
{{ super() }}
{% endblock %}
</ul>
</nav>
{% endblock %}
Expand Down