Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
  • 6 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
2  symposion/static/css/site.css
1 addition, 1 deletion not shown
View
126 symposion/static/less/site.less
@@ -112,16 +112,6 @@ h3.logo {
}
}
-section.subsection {
- background:url(../img/dotted_ln_light.png) repeat-x left top;
- padding:15px 0;
-
- h2 {
- text-transform:uppercase;
- font-size:@baseFontSize + 3;
- }
-}
-
// homepage
body.home h3.logo { display:none; }
@@ -364,7 +354,7 @@ nav#slider-nav {
// subpage
.page-head {
- padding:15px 0;
+ padding:0 0 10px;
margin-bottom:20px;
background:url(../img/dotted_ln_b.png) repeat-x left bottom;
position:relative;
@@ -467,18 +457,14 @@ nav#slider-nav {
border:3px solid #f7f7f3;
padding:15px;
overflow:hidden;
- }
-}
-
-.span9 .box-content {
- form.form-horizontal {
- margin-top:20px;
- textarea {
- width:450px;
+ h1 {
+ font-weight:normal;
+ margin-bottom:10px;
}
}
}
+
// venue
body.venue {
@@ -546,5 +532,107 @@ body.venue {
margin-bottom:5px;
}
+// auth pages
+body.auth {
+ .box-content {
+ h2 {
+ margin: 0;
+ font-size: 16px;
+ background: url('../img/box1.png') repeat-x 0 0;
+ padding: 6px 15px;
+ border-top: 1px solid white;
+ border-bottom: 1px solid #CCC;
+ text-shadow: 0px 1px 0px white;
+ }
+ }
+
+ form.form-horizontal legend { display:none; }
+ .form-horizontal .help-block {
+ color:@grayLight;
+ }
+ .box {
+ padding:0;
+ border:0;
+ .box-shadow(none);
+
+ .box-head {
+ position: relative;
+ height: 40px;
+ line-height: 40px;
+ #gradient > .vertical(#FAFAFA, #E9E9E9);
+ border: 1px solid #D5D5D5;
+ .border-radius(4px 4px 0 0);
+
+ h2 {
+ position: relative;
+ top: 2px;
+ left: 10px;
+ display: inline-block;
+ margin-right: 3em;
+ font-size:@baseFontSize + 3;
+ font-weight: 800;
+ line-height: 18px;
+ text-shadow: 1px 1px 2px rgba(255, 255, 255, .5);
+ }
+ }
+
+ .box-content {
+ padding: 40px 15px 15px;
+ border: 1px solid #D5D5D5;
+ .border-radius(5px);
+ .box-shadow(0 1px 1px rgba(0, 0, 0, 0.1));
+
+ .actions {
+
+ .action {
+ width: 22.50%;
+ display: inline-block;
+ padding: 12px 0;
+ margin: 0 .9% 1em;
+ vertical-align: top;
+ text-decoration: none;
+ background: #F3F3F3;
+ border-radius: 5px;
+ text-align:center;
+
+ .widget-icon {
+ margin-top: .25em;
+ margin-bottom: .25em;
+ font-size: 32px;
+ color: #888;
+ }
+
+ .widget-label {
+ display: block;
+ font-weight: 400;
+ color: #666;
+ }
+ }
+
+ .action:hover {
+ background: #E8E8E8;
+ }
+ }
+
+ }
+
+ .box-head + .box-content {
+ border-top: none;
+ padding-top: 20px;
+ .border-radius(0 0 4px 4px);
+ }
+ }
+
+ section.subsection {
+ background:url(../img/dotted_ln_light.png) repeat-x left top;
+ padding:15px 0;
+ margin-top:10px;
+
+ h4 {
+ font-size:@baseFontSize + 1;
+ margin-bottom:10px;
+ }
+ }
+}
View
20 symposion/templates/auth_base.html
@@ -0,0 +1,20 @@
+{% extends "site_base.html" %}
+
+{% block body_class %}auth{% endblock %}
+
+{% block body_outer %}
+ <div class="row">
+ <div class="span12">
+ <div class="page-head">
+ <h1>{% block page_title %}{% endblock %}</h1>
+ {% block breadcrumbs %}{% endblock %}
+ </div>
+ <div class="box">
+ <div class="box-content">
+ {% block body %}
+ {% endblock %}
+ </div>
+ </div>
+ </div>
+ </div>
+{% endblock %}
View
194 symposion/templates/dashboard.html
@@ -2,85 +2,135 @@
{% load i18n %}
-{% block page_title %}{% trans "Dashboard" %}{% endblock %}
+{% block body_class %}auth{% endblock %}
-{% block body %}
- <p>
- This is your dashboard where you can manage all aspects of your
- involvement in the conference, from talk proposals to sponsorship.
- </p>
+{% block body_outer %}
+ <div class="row">
+ <div class="span12">
+ <div class="page-head">
+ <h1>{% trans "Dashboard" %}</h1>
+ <p>
+ This is your dashboard where you can manage all aspects of your
+ involvement in the conference, from talk proposals to sponsorship.
+ </p>
+ {% block breadcrumbs %}{% endblock %}
+ </div>
- <section class="subsection">
+ <div class="box">
+ <div class="box-head">
+ <h2>Speaking</h2>
+ </div>
+ <div class="box-content">
+ {% if user.speaker_profile %}
+ <div class="actions">
+ <a href="{% url speaker_edit %}" class="action">
+ <i class="widget-icon icon-pencil"></i>
+ <span class="widget-label">Edit your speaker profile</span>
+ </a>
- <h2>Speaking</h2>
+ <a href="{% url proposal_submit %}" class="action">
+ <i class="widget-icon icon-bullhorn"></i>
+ <span class="widget-label">Submit a new proposal</span>
+ </a>
+ </div>
- {% if user.speaker_profile %}
- <p><a href="{% url speaker_edit %}">Edit your speaker profile</a></p>
+ <section class="subsection">
+ <h4>Your Proposals</h4>
+ {% if user.speaker_profile.proposals.exists %}
+ <table class="table">
+ <tr>
+ <th>Title</th>
+ <th>Session type</th>
+ <th>Audience level</th>
+ <th>Status</th>
+ <th>Messages</th>
+ <th>Actions</th>
+ </tr>
+ {% for proposal in user.speaker_profile.proposals.all %}
+ <tr>
+ <td><a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a></td>
+ <td>{{ proposal.kind.name }}</td>
+ <td>{{ proposal.get_audience_level_display }}</td>
+ <td>{% if proposal.cancelled %}Cancelled{% else %}{% if request.user == proposal.speaker.user %}{% if proposal.result.accepted %}Accepted{% else %}Submitted{% endif %}{% else %}Associated{% endif %}{% endif %}</td>
+ <td>{{ proposal.messages.all.count }}</td>
+ {# <td>{% if not proposal.cancelled %}{% if request.user == proposal.speaker.user %}<a href="{% url proposal_edit proposal.pk %}">Edit</a>{% endif %}{% if request.user == proposal.speaker.user %} | <a href="{% url proposal_cancel proposal.pk %}">Cancel</a>{% else %}<a href="{% url proposal_leave proposal.pk %}">Leave</a>{% endif %}{% endif %}</td> #}
+ <td>{% if not proposal.cancelled %}{% if request.user == proposal.speaker.user and proposal.can_edit %}<a href="{% url proposal_edit proposal.pk %}">Edit</a> | <a href="{% url proposal_speaker_manage proposal.id %}">Add/Remove Speakers</a>{% endif %}{% endif %}</td>
+ </tr>
+ {% endfor %}
+ </table>
+ {% else %}
+ <p>No proposals submitted yet.</p>
+ {% endif %}
+ </section>
- {% if user.speaker_profile.proposals.exists %}
- <table class="table">
- <tr>
- <th>Title</th>
- <th>Session type</th>
- <th>Audience level</th>
- <th>Status</th>
- <th>Messages</th>
- <th>Actions</th>
- </tr>
- {% for proposal in user.speaker_profile.proposals.all %}
- <tr>
- <td><a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a></td>
- <td>{{ proposal.kind.name }}</td>
- <td>{{ proposal.get_audience_level_display }}</td>
- <td>{% if proposal.cancelled %}Cancelled{% else %}{% if request.user == proposal.speaker.user %}{% if proposal.result.accepted %}Accepted{% else %}Submitted{% endif %}{% else %}Associated{% endif %}{% endif %}</td>
- <td>{{ proposal.messages.all.count }}</td>
- {# <td>{% if not proposal.cancelled %}{% if request.user == proposal.speaker.user %}<a href="{% url proposal_edit proposal.pk %}">Edit</a>{% endif %}{% if request.user == proposal.speaker.user %} | <a href="{% url proposal_cancel proposal.pk %}">Cancel</a>{% else %}<a href="{% url proposal_leave proposal.pk %}">Leave</a>{% endif %}{% endif %}</td> #}
- <td>{% if not proposal.cancelled %}{% if request.user == proposal.speaker.user and proposal.can_edit %}<a href="{% url proposal_edit proposal.pk %}">Edit</a> | <a href="{% url proposal_speaker_manage proposal.id %}">Add/Remove Speakers</a>{% endif %}{% endif %}</td>
- </tr>
- {% endfor %}
- </table>
- {% else %}
- <p>No proposals submitted yet.</p>
- {% endif %}
-
- <p><a href="{% url proposal_submit %}">Submit a new proposal</a></p>
- {% else %}
- <p>To submit a proposal, first</p>
- <p><a href="{% url speaker_create %}" class="btn"><i class="icon-plus-sign"></i> Create a speaker profile</a></p>
- {% endif %}
-
- </section>
+ {% else %}
+ <p>To submit a proposal, first create a speaker profile.</p>
+ <div class="actions">
+ <a href="{% url speaker_create %}" class="action">
+ <i class="widget-icon icon-user"></i>
+ <span class="widget-label">Create a speaker profile</span>
+ </a>
+ </div>
+ {% endif %}
+ </div>
+ </div>
- <section class="subsection">
- <h2>Sponsorship</h2>
- <p><a href="{% url sponsor_info %}">Learn more</a> about sponsorship.</p>
-
- {% if user.sponsorships.exists %}
- <p>Your sponsorship:</p>
- <ul>
- {% for sponsorship in user.sponsorships.all %}
- <li>
- {% if sponsorship.active %}
- <a href="{% url sponsor_detail sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a>
- ({{ sponsorship.level }})
- {% else %}
- <b>{{ sponsorship.name }}</b>
- ({{ sponsorship.level }})
- <i>awaiting approval</i>
+ <div class="box">
+ <div class="box-head">
+ <h2>Sponsorship</h2>
+ </div>
+ <div class="box-content">
+ <div class="actions">
+ <a href="{% url sponsor_info %}" class="action">
+ <i class="widget-icon icon-info-sign"></i>
+ <span class="widget-label">Learn about sponsorship</span>
+ </a>
+ {% if not user.sponsorships.exists %}
+ <a href="{% url sponsor_apply %}" class="action">
+ <i class="widget-icon icon-money"></i>
+ <span class="widget-label">Apply to be a sponsor</span>
+ </a>
{% endif %}
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <p><a href="{% url sponsor_apply %}" class="btn">Apply to be a sponsor</a></p>
- {% endif %}
- </section>
- {% if user.is_staff %}
- <section class="subsection">
- <h2>Staff</h2>
+ </div>
+
+ {% if user.sponsorships.exists %}
+ <section class="subsection">
+ <h4>Your Sponsorship</h4>
+ <ul>
+ {% for sponsorship in user.sponsorships.all %}
+ <li>
+ {% if sponsorship.active %}
+ <a href="{% url sponsor_detail sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a>
+ ({{ sponsorship.level }})
+ {% else %}
+ <b>{{ sponsorship.name }}</b>
+ ({{ sponsorship.level }})
+ <span class="label label-warning">awaiting approval</span>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ </section>
+ {% endif %}
+ </div>
+ </div>
- <p>Go to Django <a href="{% url admin:index %}">Admin</a></p>
- </section>
- {% endif %}
+ {% if user.is_staff %}
+ <div class="box">
+ <div class="box-head">
+ <h2>Staff</h2>
+ </div>
+ <div class="box-content">
+ <div class="actions">
+ <a href="{% url admin:index %}" class="action">
+ <i class="widget-icon icon-key"></i>
+ <span class="widget-label">Go to Django admin</span>
+ </a>
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ </div>
+ </div>
{% endblock %}
View
11 symposion/templates/proposals/proposal_submit.html
@@ -1,16 +1,17 @@
-{% extends "site_base.html" %}
+{% extends "auth_base.html" %}
{% load bootstrap_tags %}
{% load boxes_tags %}
{% load markitup_tags %}
+{% load i18n %}
+
+{% block page_title %}{% trans "Submit A Proposal" %}{% endblock %}
{% block body %}
- <h1>Submit A Proposal</h1>
-
{% box "example_proposal" %}
-
+
{% markitup_media %}
- <form method="POST" action="" enctype="multipart/form-data">
+ <form method="POST" action="" enctype="multipart/form-data" class="form-horizontal">
{% csrf_token %}
<fieldset>
{{ form|as_bootstrap }}
View
6 symposion/templates/speakers/speaker_create.html
@@ -1,4 +1,4 @@
-{% extends "site_base.html" %}
+{% extends "auth_base.html" %}
{% load bootstrap_tags %}
{% load i18n %}
@@ -6,11 +6,11 @@
{% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %}
{% block body %}
-
{# box "speaker-profile" #}
-
+
<form method="POST" action="" enctype="multipart/form-data" class="form-horizontal">
{% csrf_token %}
+ <legend>{% trans "Create Speaker Profile" %}</legend>
<fieldset>
{{ form|as_bootstrap }}
</fieldset>
View
12 symposion/templates/speakers/speaker_edit.html
@@ -1,14 +1,16 @@
-{% extends "site_base.html" %}
+{% extends "auth_base.html" %}
{% load bootstrap_tags %}
+{% load i18n %}
+
+{% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %}
{% block body %}
-
{# box "speaker-profile" #}
-
- <form method="POST" action="" enctype="multipart/form-data">
+
+ <form method="POST" action="" enctype="multipart/form-data" class="form-horizontal">
{% csrf_token %}
- <legend>Edit Speaker Profile</legend>
+ <legend>{% trans "Edit Speaker Profile" %}</legend>
<fieldset>
{{ form|as_bootstrap }}
</fieldset>
View
12 symposion/templates/sponsorship/apply.html
@@ -1,16 +1,18 @@
{% extends "site_base.html" %}
{% load bootstrap_tags %}
+{% load i18n %}
-{% block body_class %}sponsors{% endblock %}
+{% block body_class %}auth sponsors{% endblock %}
{% block body %}
-
+ <h1>{% trans "Apply to Be a Sponsor" %}</h1>
+
{# box "sponsorship-apply" #}
- <form method="POST" action="" class="uniForm">
+ <form method="POST" action="" class="form-horizontal">
{% csrf_token %}
- <legend>Apply to Be a Sponsor</legend>
+ <legend>{% trans "Apply to Be a Sponsor" %}</legend>
<fieldset>
{{ form|as_bootstrap }}
</fieldset>
@@ -19,5 +21,5 @@
</div>
</form>
<small>By submitting this sponsor application you are agreeing to the <a href="{% url sponsor_terms %}" target="_blank">terms and conditions</a>.</small>
-
+
{% endblock %}

No commit comments for this range

Something went wrong with that request. Please try again.