Skip to content
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.

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

PyBay updates #310

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Binary file added .DS_Store
Binary file not shown.
25 changes: 13 additions & 12 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[[source]]
url = "https://pypi.python.org/simple"
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

Expand All @@ -20,26 +20,27 @@ django-taggit = "==0.18.0"
django-timezone-field = "==2.0"
django-timezones = "==0.2"
django-user-accounts = "==2.0"
django = "==1.9.2"
easy-thumbnails = "==2.3"
eventlog = "==0.8.0"
symposion = {git = "https://github.com/pybay/symposion.git"}
"html5lib" = "==0.9999999"
markdown = "==2.6.5"
html5lib = "==0.9999999"
metron = "==1.3.5"
olefile = "==0.44"
pillow = "*"
pinax-boxes = "==2.1.2"
pinax-theme-bootstrap = "==5.7.2"
pinax-theme-bootstrap = "==5.6.0"
pytz = "==2015.7"
rollbar = "==0.13.2"
six = "==1.10.0"
model-mommy = "==1.3.2"
django-sass-processor = "*"
django-compressor = "*"
libsass = "*"
sqlparse = "==0.2.4"
mysqlclient = "*"
django-compressor = "==2.2"
django-sass-processor = "==0.6"
libsass = "==0.14.2"
Django = "==1.9.2"
# Markdown = "==2.6.5"
Pillow = "*"

[dev-packages]
mysqlclient = "==1.3.10"
django-debug-toolbar = "*"

[requires]
python_version = "3.6"
284 changes: 68 additions & 216 deletions Pipfile.lock

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions jobs/migrations/0004_auto_20210911_2304.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.2 on 2021-09-12 06:04
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('jobs', '0003_auto_20190319_0813'),
]

operations = [
migrations.AlterField(
model_name='job',
name='url',
field=models.SlugField(help_text='Give the posting a short slug to be used in the url'),
),
]
25 changes: 25 additions & 0 deletions pybay/proposals/migrations/0026_auto_20210911_2304.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.2 on 2021-09-12 06:04
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('proposals', '0025_auto_20190630_1703'),
]

operations = [
migrations.AlterField(
model_name='talkproposal',
name='what_attendees_will_learn',
field=models.TextField(default=''),
),
migrations.AlterField(
model_name='tutorialproposal',
name='what_attendees_will_learn',
field=models.TextField(default=''),
),
]
50 changes: 25 additions & 25 deletions pybay/templates/frontend/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link href="{% static 'new/css/lightbox.min.css' %}" rel="stylesheet" type="text/css" media="all" />
<link href="{% static 'new/css/theme-hot.css' %}" rel="stylesheet" type="text/css" media="all"/>
<link href="{% sass_src 'pybay/sass/style.scss' %}" rel="stylesheet" type="text/css" media="all"/>
<link href="{% static "font-awesome/css/font-awesome.css" %}" rel="stylesheet">
<link href="{% static 'font-awesome/css/font-awesome.css' %}" rel="stylesheet">
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<!--[if gte IE 9]>
<link rel="stylesheet" type="text/css" href="new/css/ie9.css" />
Expand All @@ -32,18 +32,18 @@
<meta name="twitter:description" content="{{ share_desc }}">
<meta name="twitter:image" content="{{ CANONICAL_HOST }}{{ share_image }}">

<meta property="fb:app_id" content="252653391896401" />
<meta property="og:url" content="{{ CANONICAL_HOST }}{{ request.get_full_path }}" />
<meta property="og:type" content="article" />
<meta property="og:title" content="{{ share_title }}" />
<meta property="og:description" content="{{ share_desc }}" />
<meta property="og:image" content="{{ CANONICAL_HOST }}{{ share_image }}" />
<meta property="og:image:width" content="{{ share_image_width }}" />
<meta property="og:image:height" content="{{ share_image_height }}" />

<meta name="description" content="{{ share_desc }}" />
{% endblock %}
{% endwith %}
<meta property="fb:app_id" content="252653391896401" />
<meta property="og:url" content="{{ CANONICAL_HOST }}{{ request.get_full_path }}" />
<meta property="og:type" content="article" />
<meta property="og:title" content="{{ share_title }}" />
<meta property="og:description" content="{{ share_desc }}" />
<meta property="og:image" content="{{ CANONICAL_HOST }}{{ share_image }}" />
<meta property="og:image:width" content="{{ share_image_width }}" />
<meta property="og:image:height" content="{{ share_image_height }}" />

<meta name="description" content="{{ share_desc }}" />
{% endblock %}
{% endwith %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down Expand Up @@ -93,18 +93,18 @@
{% endblock header %}
{% block headeroption %}

{% endblock headeroption %}
{% endblock headeroption %}

{% block content %}
{% endblock content %}
{% block content %}
{% endblock content %}

{% block subscribe %}
{% endblock subscribe %}
{% block subscribe %}
{% endblock subscribe %}

{% block pythonfans %}
{% endblock pythonfans %}
{% block footer %}
<!--Footer Starts-->
{% block pythonfans %}
{% endblock pythonfans %}
{% block footer %}
<!--Footer Starts-->
<div class="footer-container">
<footer class="classic">
<div class="container">
Expand All @@ -114,9 +114,9 @@ <h1 class="text-center" style="color: black;">{% gblock "index_produdly_sponsore
</div>
{% sponsors_footer %}
<div class="row text-center">
<p>Interested in becoming a sponsor? <a href={% url 'pybay_sponsors' %}>Check out our options</a></p>
<p>Interested in becoming a sponsor? <a href={% url 'pybay_sponsors' %}>Check out our options</a></p>
</div>
</div>
</div>

<div class="row">
<div class="col-sm-3">
Expand Down Expand Up @@ -166,4 +166,4 @@ <h1 class="text-center" style="color: black;">{% gblock "index_produdly_sponsore

{% endblock scripts %}
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions static/new/css/theme-hot.css
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,8 @@ p a,
// 7. Navigation
// --------------------------------------------------*/
nav .logo {
max-height: 45px;
max-width: 110px;
max-height: 40px;
max-width: 140px;
position: absolute;
top: -6px;
opacity: 1;
Expand Down
2 changes: 1 addition & 1 deletion static/pybay/sass/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
.nav-logo .logo {
position: static;
margin: 5px 0 5px 16px;
margin: 7px 0 5px 10px;
}

.nav-collapse {
Expand Down