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

Update form styles #340

Merged
merged 5 commits into from Jun 3, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions docs/releases/0.16.0.rst
Expand Up @@ -2,7 +2,7 @@
RapidSMS 0.16.0 release notes (under development)
=================================================

Welcome to RapidSMS 0.16.0! These release notes cover the new features in 0.14.0
Welcome to RapidSMS 0.16.0! These release notes cover the new features in 0.16.0
as well as some :ref:`backwards-incompatible-changes-0.16.0` you'll want to be
aware of when upgrading from RapidSMS 0.15.0.

Expand All @@ -13,7 +13,18 @@ What's New

.. _backwards-incompatible-changes-0.16.0:

Backwards-incompatible changes in RapidSMS 0.6.0
Backwards-incompatible changes in RapidSMS 0.16.0
=================================================

* ...
* Style files removed from base: icons.css, modules.css, splits.css, and
tables.css. These are no longer used in the new bootstrap-based pages, so
they've been removed from the RapidSMS base style files and are no longer
loaded from the base template.

The old ``locations`` contrib app does still use them, so they've been moved
into that app and that app's base template changed to load them from there.

If you have an app that's still using any of these styles, and aren't ready
to convert your app to the new, bootstrap-based look, it's probably simplest
for you to copy them from ``locations`` into your app and load them from
your app's base template.
5 changes: 4 additions & 1 deletion rapidsms/contrib/httptester/tables.py
Expand Up @@ -24,4 +24,7 @@ class Meta:
sequence = ('date', 'identity', 'text')
exclude = ('id', 'direction', 'name', 'message_id', 'external_id')
order_by = ('-date', )
attrs = {'id': 'log'}
attrs = {
'id': 'log',
'class': 'table table-striped table-bordered table-condensed'
}
8 changes: 8 additions & 0 deletions rapidsms/contrib/locations/templates/locations/base.html
@@ -1,6 +1,14 @@
{% extends "base.html" %}
{% load url from future %}

{% block stylesheets %}
{{ block.super }}
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}locations/stylesheets/tables.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}locations/stylesheets/splits.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}locations/stylesheets/modules.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}locations/stylesheets/icons.css" />
{% endblock %}

{% block title %}Locations - {{ block.super }}{% endblock %}

{% block content %}
Expand Down
3 changes: 3 additions & 0 deletions rapidsms/contrib/messagelog/tables.py
Expand Up @@ -11,3 +11,6 @@ class Meta:
model = Message
exclude = ('id', )
order_by = ('-date', )
attrs = {
'class': 'table table-striped table-bordered table-condensed'
}
6 changes: 5 additions & 1 deletion rapidsms/contrib/registration/tables.py
Expand Up @@ -8,11 +8,15 @@

class ContactTable(tables.Table):
identities = tables.Column(empty_values=(), orderable=False)
id = tables.LinkColumn('registration_contact_edit', args=[tables.utils.A('pk')])
id = tables.LinkColumn('registration_contact_edit',
args=[tables.utils.A('pk')])

class Meta:
model = Contact
order_by = ('id')
attrs = {
'class': 'table table-striped table-bordered table-condensed'
}

def render_identities(self, value, record):
return ', '.join([x.identity for x in record.connection_set.all()])
3 changes: 3 additions & 0 deletions rapidsms/static/rapidsms/stylesheets/base.css
Expand Up @@ -57,6 +57,9 @@ html, body {

table {width: 100%;}

/* Don't make sortable table header text blue */
th.sortable a { color: #000;}

.page {padding: 0;}
.well {margin-left: 15px;}

Expand Down
146 changes: 0 additions & 146 deletions rapidsms/static/rapidsms/stylesheets/forms.css

This file was deleted.

6 changes: 1 addition & 5 deletions rapidsms/templates/base.html
Expand Up @@ -9,11 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

{% block stylesheets %}
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/splits.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/modules.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/tables.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/forms.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/icons.css" />
{# <link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/tables.css" />#}
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}bootstrap/css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}rapidsms/stylesheets/base.css" />
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}bootstrap/css/bootstrap-responsive.css" />
Expand Down