Skip to content

Commit

Permalink
Rename HasGeek to Hasgeek (#311)
Browse files Browse the repository at this point in the history
  • Loading branch information
jace committed Jul 30, 2020
1 parent 8dc691b commit b346451
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 54 deletions.
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ repos:
rev: master
hooks:
- id: black
language_version: python3.7
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.2.3
hooks:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ the BSD license is below.

----------------------------------------

Copyright (c) 2010-17, HasGeek
Copyright (c) 2010-20, Hasgeek
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ Baseframe

|docs| |travis| |coveralls|

Reusable styles and templates for HasGeek projects. Setup instructions::
Reusable styles and templates for Hasgeek projects. Setup instructions::

python setup.py install

Or, to use in a development environment where Baseframe will change frequently::

python setup.py develop
make

You'll need this boilerplate in your code to use it::

Expand Down
2 changes: 1 addition & 1 deletion baseframe/forms/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ class ValidUrl(object):
"""

user_agent = (
"Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 HasGeek/linkchecker"
"Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 Hasgeek/linkchecker"
)

default_message = __("The URL “{url}” is not valid or is currently inaccessible")
Expand Down
2 changes: 1 addition & 1 deletion baseframe/static/css/baseframe-bs3.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* HasGeek baseframe CSS, based on Twitter Bootstrap.
* Hasgeek baseframe CSS, based on Twitter Bootstrap.
*/
body {
overflow-y: scroll;
Expand Down
2 changes: 1 addition & 1 deletion baseframe/static/css/baseframe.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* HasGeek baseframe CSS, based on Twitter Bootstrap.
* Hasgeek baseframe CSS, based on Twitter Bootstrap.
*/
strong {
font-weight: 600;
Expand Down
46 changes: 23 additions & 23 deletions baseframe/static/sass/baseframe-bs3.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*!
* HasGeek baseframe CSS, based on Twitter Bootstrap.
* Hasgeek baseframe CSS, based on Twitter Bootstrap.
*/

// Compass
@import "compass";
@import "compass/layout";
@import 'compass';
@import 'compass/layout';

// Local settings
@import "settings-bs3";
@import "layout";
@import "bootstrap3-custom";
@import "infobox";
@import "datepicker";
@import "adunits";
@import "print";
@import "responsive";
@import 'settings-bs3';
@import 'layout';
@import 'bootstrap3-custom';
@import 'infobox';
@import 'datepicker';
@import 'adunits';
@import 'print';
@import 'responsive';

// Only import this when in debug mode
// @import "gridlines";
Expand All @@ -23,20 +23,20 @@
baseframe customizations
*/
#page-header {
display: none;
display: none;
}
header {
min-height: 50px;
min-height: 50px;
}
@media screen and (min-width: 768px) {
#page-header{
display: block;
}
header {
min-height: 0;
}
.listwidget.horizlist li {
display: inline-block;
margin-right: 1em
}
#page-header {
display: block;
}
header {
min-height: 0;
}
.listwidget.horizlist li {
display: inline-block;
margin-right: 1em;
}
}
22 changes: 11 additions & 11 deletions baseframe/static/sass/baseframe.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*!
* HasGeek baseframe CSS, based on Twitter Bootstrap.
* Hasgeek baseframe CSS, based on Twitter Bootstrap.
*/

// Compass
@import "compass";
@import "compass/layout";
@import 'compass';
@import 'compass/layout';

// Local settings
@import "settings";
@import "bootstrap-custom";
@import "layout";
@import "infobox";
@import "datepicker";
@import "adunits";
@import "print";
@import "responsive";
@import 'settings';
@import 'bootstrap-custom';
@import 'layout';
@import 'infobox';
@import 'datepicker';
@import 'adunits';
@import 'print';
@import 'responsive';

// Only import this when in debug mode
// @import "gridlines";
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<div class="footer-inner">
<div class="container">
{% block footer -%}
<span class="no-print">{% if 'FOOTER_MESSAGE' in config %}{{ config['FOOTER_MESSAGE'] }}{% else %}{% trans %}Copyright &copy; 2010-15 HasGeek{% endtrans %}{% endif %}</span>
<span class="no-print">{% if 'FOOTER_MESSAGE' in config %}{{ config['FOOTER_MESSAGE'] }}{% else %}{% trans %}Copyright &copy; 2010-20 Hasgeek{% endtrans %}{% endif %}</span>
{%- endblock %}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</button>
{% endif -%}
{% block navbar_brand %}
<a class="navbar-brand" href="{{ request.script_root or '/' }}" title="Home">HasGeek</a>
<a class="navbar-brand" href="{{ request.script_root or '/' }}" title="Home">Hasgeek</a>
{% endblock %}
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
Expand Down Expand Up @@ -163,7 +163,7 @@
</nav>
{%- endmacro -%}

{%- macro hgnav(site_title="HasGeek", site_nav_button=none, site_nav=none, auth=true, network=true, site_links=[], user_links=[], loginbtntext="Login") -%}
{%- macro hgnav(site_title="Hasgeek", site_nav_button=none, site_nav=none, auth=true, network=true, site_links=[], user_links=[], loginbtntext="Login") -%}
<nav class="navbar navbar-default navbar-fixed-top" id="hgnav" role="navigation">
<div class="container">
<div class="navbar-header pull-left hg-header-app-nav">
Expand Down Expand Up @@ -248,7 +248,7 @@
{%- macro add_hasgeek_network() -%}
{% with %}
{% set network_links=[
{'title': 'HasGeek', 'url': 'http://hasgeek.com', 'icon': 'https://hasgeek.com/static/img/hg-banner.png'},
{'title': 'Hasgeek', 'url': 'http://hasgeek.com/', 'icon': 'https://hasgeek.com/static/img/hg-banner.png'},
{'title': 'Hasjob', 'url': 'https://hasjob.co/', 'icon': 'https://static.hasjob.co/static/img/hasjob-logo-200x200.png'},
{'title': 'HGTV', 'url': 'https://hasgeek.tv/', 'icon': 'https://static.hasgeek.co.in/static/img/hgnav/hg_hgtv.png'},
]%}
Expand Down
2 changes: 1 addition & 1 deletion baseframe/templates/baseframe/mui/baseframe.html.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<footer class="footer{% if self.sidedrawer() %} footer--with-sidebar{% endif %}">
<div class="footer__container">
{% block footer -%}
<span class="no-print">{% if 'FOOTER_MESSAGE' in config %}{{ config['FOOTER_MESSAGE'] }}{% else %}{% trans %}Copyright &copy; 2010-15 HasGeek{% endtrans %}{% endif %}</span>
<span class="no-print">{% if 'FOOTER_MESSAGE' in config %}{{ config['FOOTER_MESSAGE'] }}{% else %}{% trans %}Copyright &copy; 2010-20 Hasgeek{% endtrans %}{% endif %}</span>
{% block footerinner -%}{%- endblock %}
{%- endblock %}
</div>
Expand Down
6 changes: 3 additions & 3 deletions baseframe/templates/baseframe/mui/components.html.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<iframe height="0" width="0" tabindex="-1" style="display: none; border: 0; height: 0; width: 0" aria-hidden="true" role="presentation" src="{{ url }}"></iframe>
{% endmacro %}

{%- macro hgtopnav(site_title="HasGeek", side_menu_button=none, site_links=[], auth=true, network=true, loginbtntext="Login", user_links=[]) %}
{%- macro hgtopnav(site_title="Hasgeek", side_menu_button=none, site_links=[], auth=true, network=true, loginbtntext="Login", user_links=[]) %}
<nav id="hgnav" class="header__nav" role="navigation">
<div class="header__site-title {% if current_auth.is_anonymous -%}header__site-title--smaller{% endif %}">
{% if side_menu_button %}
Expand Down Expand Up @@ -63,7 +63,7 @@
{%- endif %}
{%- endmacro %}

{%- macro hgsidenav(site_title="HasGeek", site_links=[], user_links=[]) %}
{%- macro hgsidenav(site_title="Hasgeek", site_links=[], user_links=[]) %}
<div class="header__site-title header__site-title--sidenav">
{{site_title}}
</div>
Expand Down Expand Up @@ -116,7 +116,7 @@
{%- macro add_hasgeek_network() %}
{% with %}
{% set network_links=[
{'title': 'HasGeek', 'url': 'http://hasgeek.com', 'icon': 'https://hasgeek.com/static/img/hg-banner.png'},
{'title': 'Hasgeek', 'url': 'http://hasgeek.com/', 'icon': 'https://hasgeek.com/static/img/hg-banner.png'},
{'title': 'Hasjob', 'url': 'https://hasjob.co/', 'icon': 'https://static.hasjob.co/static/img/hasjob-logo-200x200.png'},
{'title': 'HGTV', 'url': 'https://hasgeek.tv/', 'icon': 'https://static.hasgeek.co.in/static/img/hgnav/hg_hgtv.png'},
]%}
Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# General information about the project.
project = 'baseframe'
copyright = '2012-20, HasGeek'
copyright = '2012-20, Hasgeek'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -192,7 +192,7 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'baseframe.tex', 'baseframe Documentation', 'HasGeek', 'manual')
('index', 'baseframe.tex', 'baseframe Documentation', 'Hasgeek', 'manual')
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -220,7 +220,7 @@

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [('index', 'baseframe', 'baseframe Documentation', ['HasGeek'], 1)]
man_pages = [('index', 'baseframe', 'baseframe Documentation', ['Hasgeek'], 1)]

# If true, show URL addresses after external links.
# man_show_urls = False
Expand All @@ -236,7 +236,7 @@
'index',
'baseframe',
'baseframe Documentation',
'HasGeek',
'Hasgeek',
'baseframe',
'One line description of project.',
'Miscellaneous',
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Welcome to baseframe's documentation!

Baseframe's documentation
*************************
Reusable styles and templates for HasGeek projects.
Reusable styles and templates for Hasgeek projects.

:license: BSD, see LICENSE.txt for more details.

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def run(self):
setup(
name='baseframe',
version=version,
description='Baseframe for HasGeek projects',
description='Baseframe for Hasgeek projects',
long_description=README,
classifiers=[
"Programming Language :: Python",
Expand Down

0 comments on commit b346451

Please sign in to comment.