diff --git a/RIGS/templates/event_checklist_detail.html b/RIGS/templates/event_checklist_detail.html index 2df9e169..02816ee8 100644 --- a/RIGS/templates/event_checklist_detail.html +++ b/RIGS/templates/event_checklist_detail.html @@ -235,7 +235,6 @@ {% endif %} -
{% button 'edit' url='ec_edit' pk=object.pk %} {% button 'view' url='event_detail' pk=object.pk text="Event" %} diff --git a/RIGS/templates/event_checklist_form.html b/RIGS/templates/event_checklist_form.html index d581774e..8ba36340 100644 --- a/RIGS/templates/event_checklist_form.html +++ b/RIGS/templates/event_checklist_form.html @@ -32,9 +32,9 @@ $(document).ready(function () { $('button[data-action=add]').on('click', function (event) { event.preventDefault(); - var target = $($(this).attr('data-target')); - var newID = Number(target.attr('data-pk')); - var newRow = $($(this).attr('data-clone')) + let target = $($(this).attr('data-target')); + let newID = Number(target.attr('data-pk')); + let newRow = $($(this).attr('data-clone')) .clone().attr('style', "") .attr('id', function(i, val){ return val.split("_")[0] + '_' + newID; @@ -204,7 +204,7 @@ - + @@ -240,7 +240,7 @@
-
Electrical Checks for ‘Small’ TEC Events <6kVA (aprox. 26A)
+
Electrical Checks for ‘Small’ TEC Events <6kVA (approx. 26A)
{% include 'partials/checklist_checkbox.html' with formitem=form.rcds %} {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %} @@ -337,7 +337,7 @@
-
+
{% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %} {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %} {% include 'partials/ec_power_info.html' %} diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html index d8e9d311..d76e0860 100644 --- a/RIGS/templates/event_detail.html +++ b/RIGS/templates/event_detail.html @@ -38,7 +38,7 @@
Email
{{ object.person.email|linkornone:'mailto' }}
Phone Number
-
{{ object.person.phone|linkornone:'tel' }}
+
{{ object.person.phone|linkornone:'tel' }}
@@ -59,7 +59,7 @@
Email
{{ object.organisation.email|linkornone:'mailto' }}
Phone Number
-
{{ object.organisation.phone|linkornone:'tel' }}
+
{{ object.organisation.phone|linkornone:'tel' }}
Has SU Account
{{ event.organisation.union_account|yesno|capfirst }}
diff --git a/RIGS/templates/event_embed.html b/RIGS/templates/event_embed.html index e4c1b6b7..8f577d4e 100644 --- a/RIGS/templates/event_embed.html +++ b/RIGS/templates/event_embed.html @@ -2,14 +2,14 @@ {% load static %} {% block content %} -
-
- - Rig Information Gathering System - -
+
+
+ + Rig Information Gathering System + +
-
+
{% if object.mic %}
@@ -20,82 +20,81 @@ {% endif %} -

- - {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} - | {{ object.name }} +

+ + {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} + | {{ object.name }} {% if object.venue %} - at {{ object.venue }} + at {{ object.venue }} + {% endif %} +
+ {{ object.start_date|date:"D d/m/Y" }} + {% if object.has_start_time %} + {{ object.start_time|date:"H:i" }} + {% endif %} + {% if object.end_date or object.has_end_time %} + – + {% endif %} + {% if object.end_date and object.end_date != object.start_date %} + {{ object.end_date|date:"D d/m/Y" }} + {% endif %} + {% if object.has_end_time %} + {{ object.end_time|date:"H:i" }} {% endif %} -
- {{ object.start_date|date:"D d/m/Y" }} - {% if object.has_start_time %} - {{ object.start_time|date:"H:i" }} - {% endif %} - {% if object.end_date or object.has_end_time %} - – - {% endif %} - {% if object.end_date and object.end_date != object.start_date %} - {{ object.end_date|date:"D d/m/Y" }} - {% endif %} - {% if object.has_end_time %} - {{ object.end_time|date:"H:i" }} - {% endif %} -

+ -
-
-

- Status: - {{ object.get_status_display }} -

-

- {% if object.is_rig %} - Client: {{ object.person.name }} - {% if object.organisation %} - for {{ object.organisation.name }} +

+
+

+ Status: + {{ object.get_status_display }} +

+

+ {% if object.is_rig %} + Client: {{ object.person.name }} + {% if object.organisation %} + for {{ object.organisation.name }} + {% endif %} + {% if object.dry_hire %}(Dry Hire){% endif %} + {% else %} + Non-Rig {% endif %} - {% if object.dry_hire %}(Dry Hire){% endif %} - {% else %} - Non-Rig - {% endif %} -

-

- MIC: - {% if object.mic %} - {{object.mic.name}} - {% else %} - None - {% endif %} -

-
-
- {% if object.meet_at %} -

- Crew meet: - {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}

- {% endif %} - {% if object.access_at %}

- Access at: - {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }} + MIC: + {% if object.mic %} + {{object.mic.name}} + {% else %} + None + {% endif %}

- {% endif %} -

- Last updated: - {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}" -

+
+
+ {% if object.meet_at %} +

+ Crew meet: + {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }} +

+ {% endif %} + {% if object.access_at %} +

+ Access at: + {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }} +

+ {% endif %} +

+ Last updated: + {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}" +

+
+ {% if object.description %} +

+ Description: + {{ object.description|linebreaksbr }} +

+ {% endif %}
- {% if object.description %} -

- Description: - {{ object.description|linebreaksbr }} -

- {% endif %} -
-
{% endblock %} diff --git a/RIGS/templates/eventauthorisation_client_request.html b/RIGS/templates/eventauthorisation_client_request.html index a6bb7bb9..bdb72d5f 100644 --- a/RIGS/templates/eventauthorisation_client_request.html +++ b/RIGS/templates/eventauthorisation_client_request.html @@ -36,6 +36,7 @@

Your event will not be booked until you complete this form.

-

TEC PA & Lighting
+

TEC PA & Lighting

+
{% endblock %} diff --git a/RIGS/templates/invoice_detail.html b/RIGS/templates/invoice_detail.html index c2cb3f8f..ad65a2f8 100644 --- a/RIGS/templates/invoice_detail.html +++ b/RIGS/templates/invoice_detail.html @@ -60,10 +60,10 @@ - + + + @@ -73,7 +73,7 @@ {% endfor %} diff --git a/RIGS/templates/invoice_list.html b/RIGS/templates/invoice_list.html index 81ab4fbb..c8648f09 100644 --- a/RIGS/templates/invoice_list.html +++ b/RIGS/templates/invoice_list.html @@ -27,7 +27,7 @@ {% if invoice.void %}(VOID){% elif invoice.is_closed %}(PAID){% else %}(O/S){% endif %} + + diff --git a/RIGS/templates/risk_assessment_detail.html b/RIGS/templates/risk_assessment_detail.html index a242b76c..25ea8351 100644 --- a/RIGS/templates/risk_assessment_detail.html +++ b/RIGS/templates/risk_assessment_detail.html @@ -5,8 +5,8 @@ {% load linkornone from filters %} {% block content %} -
-
+
+

Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}

General
@@ -152,13 +152,12 @@
+
+ Edit + View Event + {{ object.review_string|safe }} + {% include 'partials/last_edited.html' with target="riskassessment_history" %} +
-
- Edit - View Event - {{ object.review_string|safe }} - {% include 'partials/last_edited.html' with target="riskassessment_history" %} -
-
{% endblock %} diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html index 3a0277b7..e2f2d001 100644 --- a/assets/templates/asset_audit.html +++ b/assets/templates/asset_audit.html @@ -40,8 +40,8 @@
{% include 'partials/form_field.html' with field=form.date_acquired col="col-6" %}
- Today - Unknown + +
@@ -64,16 +64,16 @@
{% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
- 5{{ form.length.help_text }} - 10{{ form.length.help_text }} - 20{{ form.length.help_text }} + + +
{% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
- 1.5{{ form.csa.help_text }} - 2.5{{ form.csa.help_text }} + +
diff --git a/assets/templates/asset_embed.html b/assets/templates/asset_embed.html index beb8538f..12bdedca 100644 --- a/assets/templates/asset_embed.html +++ b/assets/templates/asset_embed.html @@ -2,37 +2,35 @@ {% load static %} {% block content %} -
-
- - TEC Asset Database - +
+
+ + TEC Asset Database + +
+
+

Asset: {{ object.asset_id }} | {{ object.description }}

+

+ + Category: + {{ object.category }} + +   + + Status: + {{ object.status }} + +

+
+ {% if object.serial_number %} +
Serial Number:
+
{{ object.serial_number }}
+ {% endif %} + {% if object.comments %} +
Comments:
+
{{ object.comments|linebreaksbr }}
+ {% endif %} +
+
- -
-

Asset: {{ object.asset_id }} | {{ object.description }}

-

- - Category: - {{ object.category }} - -   - - Status: - {{ object.status }} - -

-
- {% if object.serial_number %} -
Serial Number:
-
{{ object.serial_number }}
- {% endif %} - {% if object.comments %} -
Comments:
-
{{ object.comments|linebreaksbr }}
- {% endif %} -
-
Date - Amount - Method - + DateAmountMethod
{{ payment.amount|floatformat:2 }} {{ payment.get_method_display }} - +
N{{ invoice.event.pk|stringformat:"05d" }}: {{ invoice.event.name }}
{{ invoice.event.get_status_display }}{% if not invoice.event.mic %}, No MIC{% endif %} - 		{% if invoice.event.organisation %} {{ invoice.event.organisation.name }} diff --git a/RIGS/templates/partials/ec_power_info.html b/RIGS/templates/partials/ec_power_info.html index aaf4543d..8dd1f92d 100644 --- a/RIGS/templates/partials/ec_power_info.html +++ b/RIGS/templates/partials/ec_power_info.html @@ -20,6 +20,7 @@
300 167
500 100
-
-
{% endblock %} diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html index a1374bed..8f676b4d 100644 --- a/assets/templates/asset_form.html +++ b/assets/templates/asset_form.html @@ -33,7 +33,7 @@ url: '{% url 'asset_search_json' %}', type: "GET", data: function () { - var params = { + let params = { {% verbatim %}query: '{{{q}}}'{% endverbatim %} }; return params; diff --git a/assets/templates/cable_type_form.html b/assets/templates/cable_type_form.html index 4e9cbac5..fb7b5bbb 100644 --- a/assets/templates/cable_type_form.html +++ b/assets/templates/cable_type_form.html @@ -4,58 +4,58 @@ {% load cache %} {% block content %} -{% if create %} -
-{% elif edit %} - -{% endif %} + {% if create %} + + {% elif edit %} + + {% endif %} {% include 'form_errors.html' %} {% csrf_token %} - +
-
- {% if create or edit %} - {% for field in form %} -
- {% include 'partials/form_field.html' with field=field %} -
- {% endfor %} -
- {% button 'submit' %} -
- {% else %} -
-
-
-
Socket
-
{{ object.socket|default_if_none:'-' }}
+
+ {% if create or edit %} + {% for field in form %} +
+ {% include 'partials/form_field.html' with field=field %} +
+ {% endfor %} +
+ {% button 'submit' %} +
+ {% else %} +
+
+
+
Socket
+
{{ object.socket|default_if_none:'-' }}
-
Plug
-
{{ object.plug|default_if_none:'-' }}
+
Plug
+
{{ object.plug|default_if_none:'-' }}
-
Circuits
-
{{ object.circuits|default_if_none:'-' }}
+
Circuits
+
{{ object.circuits|default_if_none:'-' }}
-
Cores
-
{{ object.cores|default_if_none:'-' }}
-
-
+
Cores
+
{{ object.cores|default_if_none:'-' }}
+
+
+
+
+ {% button 'edit' url='cable_type_update' pk=object.id %} +
+ {% cache None cable_type_assets object %} +
+
+
Associated Assets
+ {% with object.asset_set.all as object_list %} + {% include 'partials/asset_list_table.html' %} + {% endwith %} +
+
+ {% endcache %} + {% endif %}
-
- {% button 'edit' url='cable_type_update' pk=object.id %} -
- {% cache None cable_type_assets object %} -
-
-
Associated Assets
- {% with object.asset_set.all as object_list %} - {% include 'partials/asset_list_table.html' %} - {% endwith %} -
-
- {% endcache %} - {% endif %} -
{% endblock %} diff --git a/templates/bootstrap.html b/templates/bootstrap.html index 7e6ae2fb..f1cbed63 100644 --- a/templates/bootstrap.html +++ b/templates/bootstrap.html @@ -1,151 +1,152 @@ {% extends 'base_rigs.html' %} {% block content %} -
-
-
-
- - -
+
+
+
+
+ + +
-
-
-
-
-
-

- - Typography -

-

+

+
+
+
+
+
+

+ + Typography +

+

- + - + - + - + - -

-
+ + +
-
-
-
-
-
-

Headings

-

h1. Bootstrap heading

-

h2. Bootstrap heading

-

h3. Bootstrap heading

-

h4. Bootstrap heading

-
h5. Bootstrap heading
-
h6. Bootstrap heading
+
+
+
+
+
+

Headings

+

h1. Bootstrap heading

+

h2. Bootstrap heading

+

h3. Bootstrap heading

+

h4. Bootstrap heading

+
h5. Bootstrap heading
+
h6. Bootstrap heading
-

Lead

-

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

+

Lead

+

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

-

Styles

-

You can use the mark tag to - highlight text.

-

- This line of text is meant to be treated as deleted text. -

-

- This line of text is meant to be treated as no longer accurate. -

-

- This line of text is meant to be treated as an addition to the document. -

-

- This line of text will render as underlined -

-

This line of text is meant to be treated as fine print.

-

This line rendered as bold text.

-

This line rendered as italicized text.

-

And this is a muted text.

-

abbr abbr+init

+

Styles

+

You can use the mark tag to + highlight text.

+

+ This line of text is meant to be treated as deleted text. +

+

+ This line of text is meant to be treated as no longer accurate. +

+

+ This line of text is meant to be treated as an addition to the document. +

+

+ This line of text will render as underlined +

+

This line of text is meant to be treated as fine print.

+

This line rendered as bold text.

+

This line rendered as italicized text.

+

And this is a muted text.

+

abbr abbr+init

-

Colors

-

+

Colors

+

- .text-primary + .text-primary - .text-secondary + .text-secondary - .text-success + .text-success - .text-danger + .text-danger - .text-warning + .text-warning - .text-info + .text-info - .text-light + .text-light - .text-dark + .text-dark - .text-white + .text-white -

-

+

+

- Primary link + Primary link - Secondary link + Secondary link - Success link + Success link - Danger link + Danger link - Warning link + Warning link - Info link + Info link - Light link + Light link - Dark link + Dark link - White link + White link -

+

-

Inline code

-

For example, <section> should be wrapped as inline.

-

y = mx + b

-

To switch directories, type cd followed by the name of the directory.
To edit settings, press ctrl + , -

-

This text is meant to be treated as sample output from a computer program.

-
-
-

Displays

-

Display 1

-

Display 2

-

Display 3

-

Display 4

+

Inline code

+

For example, <section> should be wrapped as inline.

+

y = mx + b

+

To switch directories, type cd followed by the name of the directory.
To edit settings, press ctrl + , +

+

This text is meant to be treated as sample output from a computer program.

+
+
+

Displays

+

Display 1

+

Display 2

+

Display 3

+

Display 4

-

Sample body

-

- Lórum ipse - mint senyért - nyált ságos iség, ahol beles metás, csaprozás, vermény, csaprát - és más meni zsorlóca kuncáskodik. Mosztag, férzet napé, fuvódás 11, törnyélés ; valamint szuvegés vitancs: a dozmus drikója, - jultsás kelés magyarul. A szuvegés és gyarány pasztákban buggyos mendernyékről, filingéjükről és pucájukról húzódik a - fabampa. Hűtő benne a legújabban belég mendernyék mártja is, részletesen sáskodik a kétenc fríg lepkonyaival. Csétletésről - cigál le egy kéző lengelész csapárába rimulnia, ahol három másik szivény együtt érleti spotráit. Ha a bénulás summája - kalkodik, úgy púdulhat, mintha az volna a sülső csoltása, hogy a szedhentes és egyes tengyelét lécetse ki a pávágyokból. - Ez vajon vertető ölyök vagy vegítő dosna? Szalalizál bunya a felegesben olyan szellőző kedő, amely farisban kevetteti - a nyagondos hizmusok „énemlő” lárias mizmusait? -

+

Sample body

+

+ Lórum ipse - mint senyért - nyált ságos iség, ahol beles metás, csaprozás, vermény, csaprát + és más meni zsorlóca kuncáskodik. Mosztag, férzet napé, fuvódás 11, törnyélés ; valamint szuvegés vitancs: a dozmus drikója, + jultsás kelés magyarul. A szuvegés és gyarány pasztákban buggyos mendernyékről, filingéjükről és pucájukról húzódik a + fabampa. Hűtő benne a legújabban belég mendernyék mártja is, részletesen sáskodik a kétenc fríg lepkonyaival. Csétletésről + cigál le egy kéző lengelész csapárába rimulnia, ahol három másik szivény együtt érleti spotráit. Ha a bénulás summája + kalkodik, úgy púdulhat, mintha az volna a sülső csoltása, hogy a szedhentes és egyes tengyelét lécetse ki a pávágyokból. + Ez vajon vertető ölyök vagy vegítő dosna? Szalalizál bunya a felegesben olyan szellőző kedő, amely farisban kevetteti + a nyagondos hizmusok „énemlő” lárias mizmusait? +

-

Code block

- - 
/**
+                    
Code block

+                    
+                    
/**
  * @author John Smith <john.smith@example.com>
  */
 package l2f.gameserver.model;
@@ -161,2579 +162,2578 @@ public abstract class L2Char extends L2Object {
 		}
 	}
 }

-
-
-
-
-

Blockquote

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
Someone famous in Source Title
-
-
-
-
-
-

...centered

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
Someone famous in Source Title
-
-
-
-
-
-

...on right

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
Someone famous in Source Title
-
-
-
-
-
-

List

-
    -
  • Lorem ipsum dolor sit amet
    • -
  • Consectetur adipiscing elit
    • -
  • Integer molestie lorem at massa
    • -
  • Facilisis in pretium nisl aliquet
    • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
      • -
    • Purus sodales ultricies
      • -
    • Vestibulum laoreet porttitor sem
      • -
    • Ac tristique libero volutpat at
      • -
    -
    • -
  • Faucibus porta lacus fringilla vel
    • -
  • Aenean sit amet erat nunc
    • -
  • Eget porttitor lorem
    • -
-
-
-

...unstyled

-
    -
  • Lorem ipsum dolor sit amet
    • -
  • Consectetur adipiscing elit
    • -
  • Integer molestie lorem at massa
    • -
  • Facilisis in pretium nisl aliquet
    • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
      • -
    • Purus sodales ultricies
      • -
    • Vestibulum laoreet porttitor sem
      • -
    • Ac tristique libero volutpat at
      • -
    -
    • -
  • Faucibus porta lacus fringilla vel
    • -
  • Aenean sit amet erat nunc
    • -
  • Eget porttitor lorem
    • -
-
-
-

...inline

-
    -
  • Lorem ipsum
    • -
  • Phasellus iaculis
    • -
  • Nulla volutpat
    • -
-
-
-
-
-

Definition list

-
-
-
-
Description lists
-
A description list is perfect for defining terms.
- -
Euismod
-
-

Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.

-

Donec id elit non mi porta gravida at eget metus.

-
- -
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
- -
Truncated term is truncated
-
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
- -
Nesting
-
-
-
Nested definition list
-
Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.
-
-
-
- -
-
-

Background colors

-
- - -
-
.bg-primary
-
- - -
-
.bg-secondary
-
- - -
-
.bg-success
-
- - -
-
.bg-danger
-
- - -
-
.bg-warning
-
- - -
-
.bg-info
-
- - -
-
.bg-light
-
- - -
-
.bg-dark
-
- - -
-
.bg-white
-
- -
-
-
-
- -
-
-
-
-

- - Images -

-

- - - - - - - - -

-
- -
-
-
-
-
-

Responsive image

- responsive image -
-
-

Thumbnail

- thumbnail image -
-
-

Figure

-
- Figure -
A caption for the above image.
-
-
-
-

Media

-
- Generic placeholder image -
-
Media heading
- Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in - vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in - faucibus. - -
- - Generic placeholder image - -
-
Media heading
- Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in - vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis - in faucibus. -
-
-
-
-
-
-
-
- -
-
-
-
-

- - Tables -

-

- - - - -

-
- -
-
-
-
-
-

Table

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
-
-

Inversed table

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
-
-
-
-

Table with colors

-

Note: Use table-* classes.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeColumn headingColumn heading
DefaultColumn contentColumn content
ActiveColumn contentColumn content
PrimaryColumn contentColumn content
SecondaryColumn contentColumn content
SuccessColumn contentColumn content
DangerColumn contentColumn content
WarningColumn contentColumn content
InfoColumn contentColumn content
LightColumn contentColumn content
DarkColumn contentColumn content
-
-
-

Inversed table with colors

-

Note: Use bg-* and text-* classes.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeColumn headingColumn heading
DefaultColumn contentColumn content
PrimaryColumn contentColumn content
SecondaryColumn contentColumn content
SuccessColumn contentColumn content
DangerColumn contentColumn content
WarningColumn contentColumn content
InfoColumn contentColumn content
LightColumn contentColumn content
DarkColumn contentColumn content
-
-
-
-
-

Default header

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
-
-

Inversed header

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
-
-
-
-

Small table

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
-
-
-
-
- -
-
-
-
-

- - List groups -

-

- - - - -

-
- -
-
-
-
-
- -
-
-

...with actions and colors

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+
+

Blockquote

+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
+
+
+
+
+
+

...centered

+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
+
+
+
+
+
+

...on right

+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
+
+
+
+
+
+

List

+
    +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit +
      +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
      • +
    +
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem
    • +
+
+
+

...unstyled

+
    +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit +
      +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
      • +
    +
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem
    • +
+
+
+

...inline

+
    +
  • Lorem ipsum
    • +
  • Phasellus iaculis
    • +
  • Nulla volutpat
    • +
+
+
+
+
+

Definition list

+
+
+
+
Description lists
+
A description list is perfect for defining terms.
+ +
Euismod
+
+

Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.

+

Donec id elit non mi porta gravida at eget metus.

+
+ +
Malesuada porta
+
Etiam porta sem malesuada magna mollis euismod.
+ +
Truncated term is truncated
+
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
+ +
Nesting
+
+
+
Nested definition list
+
Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.
+
+
+
+ +
+
+

Background colors

+
+ + +
+
.bg-primary
+
+ + +
+
.bg-secondary
+
+ + +
+
.bg-success
+
+ + +
+
.bg-danger
+
+ + +
+
.bg-warning
+
+ + +
+
.bg-info
+
+ + +
+
.bg-light
+
+ + +
+
.bg-dark
+
+ + +
+
.bg-white
+
+ +
+
+
+ +
+
+
+
+

+ + Images +

+

+ + + + + + + + +

+
+ +
+
+
+
+
+

Responsive image

+ responsive image +
+
+

Thumbnail

+ thumbnail image +
+
+

Figure

+
+ Figure +
A caption for the above image.
+
+
+
+

Media

+
+ Generic placeholder image +
+
Media heading
+ Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in + vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in + faucibus. + +
+ + Generic placeholder image + +
+
Media heading
+ Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in + vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis + in faucibus. +
+
+
+
+
+
+
+
+ +
+
+
+
+

+ + Tables +

+

+ + + + +

+
+ +
+
+
+
+
+

Table

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+

Inversed table

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+
+
+

Table with colors

+

Note: Use table-* classes.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeColumn headingColumn heading
DefaultColumn contentColumn content
ActiveColumn contentColumn content
PrimaryColumn contentColumn content
SecondaryColumn contentColumn content
SuccessColumn contentColumn content
DangerColumn contentColumn content
WarningColumn contentColumn content
InfoColumn contentColumn content
LightColumn contentColumn content
DarkColumn contentColumn content
+
+
+

Inversed table with colors

+

Note: Use bg-* and text-* classes.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeColumn headingColumn heading
DefaultColumn contentColumn content
PrimaryColumn contentColumn content
SecondaryColumn contentColumn content
SuccessColumn contentColumn content
DangerColumn contentColumn content
WarningColumn contentColumn content
InfoColumn contentColumn content
LightColumn contentColumn content
DarkColumn contentColumn content
+
+
+
+
+

Default header

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+

Inversed header

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+
+
+

Small table

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+
+
+ +
+
+
+
+

+ + List groups +

+

+ + + + +

+
+ +
+
+
+
+
+ +
+
+

...with actions and colors

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + -
-
-
-

...with custom content

-
- -
-
List group item heading
- 3 days ago -
-

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

- Donec id elit non mi porta. - - -
-
List group item heading
- 3 days ago -
-

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

- Donec id elit non mi porta. - - -
-
List group item heading
- 3 days ago -
-

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

- Donec id elit non mi porta. - -
-
-
-
-
+
+
+
+

...with custom content

+
+ +
+
List group item heading
+ 3 days ago +
+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ Donec id elit non mi porta. + + +
+
List group item heading
+ 3 days ago +
+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ Donec id elit non mi porta. + + +
+
List group item heading
+ 3 days ago +
+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ Donec id elit non mi porta. + +
+
+
+ + -
-
-
-
-

- - Buttons -

-

+
+
+
+
+

+ + Buttons +

+

- + - + - + - + - -

-
+ +

+
-
-
-
+
+ +
-
-
-

General buttons

-
+
+
+

General buttons

+
- + - + - + - + - + - + - + - + - + - -
-
+ +
+
- + - + - + - + - + - + - + - + - + - -
-
+ +
+
- + - + - + - + - + - + - + - + - + - -
+ +
-

Outline buttons

-
+

Outline buttons

+
- + - + - + - + - + - + - + - + -
-
+
+
- + - + - + - + - + - + - + - + -
-
+
+
- + - + - + - + - + - + - + - + -
-
-
-

Sizes

-
- - - -
-
-
-

Groups and dropdown

- +
+
+

Sizes

+
+ + + +
+
+
+

Groups and dropdown

+ -
+
+ + +
+
Dropdown header
+ Action + Disabled link + Something else here +
+ Separated link +
+
+
+
-
-

Pagination

-
-
-
- -
-
-
-
-

- - Jumbotrons -

-

- - - - -

-
- -
-
-
-
-
-

Default jumbotron

-
-

Hello, world!

-

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

-
-

It uses utility classes for typography and spacing to space content out within the larger container.

-

- Learn more -

-
- -

Fluid jumbotron

-
-
-

Fluid jumbotron

-

This is a modified jumbotron that occupies the entire horizontal space of its parent.

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

- - Cards -

-

- - - - -

-
- -
-
-
-
-
-

Various types of cards

-
-
-
- This is some text within a card block. -
-
-
-
    -
  • Cras justo odio
    • -
  • Dapibus ac facilisis in
    • -
  • Vestibulum at eros
    • -
-
-
-
-

Card title

-
Card subtitle
-

Some quick example text to build on the card title and make up the bulk of the card's content.

- Card link - Another link -
-
-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

-
- - Someone famous in Source Title - -
-
-
-
-
- Featured -
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
-
-
- Featured -
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
- 2 days ago -
-
-
- Card image -
-
- Card image cap -
-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
-
-

Card title

-

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little - bit longer.

-

Last updated 3 mins ago

-
- Card image cap -
-
- Card image cap -
-

Card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
    -
  • Cras justo odio
    • -
  • Dapibus ac facilisis in
    • -
  • Vestibulum at eros
    • -
-
- Card link - Another link -
-
-
-
- -
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
-
-
- -
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
-
-
-
-
-
-

Colored cards

-
- - - -
-
-
Header
-
-

Primary card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Secondary card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Success card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Danger card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Warning card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Info card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Light card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - - -
-
-
Header
-
-

Dark card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
-

Cards with colored borders

-
- - -
-
-
Header
-
-

Primary card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Secondary card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Success card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Danger card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Warning card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Info card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Light card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

-
-
-
- - -
-
-
Header
-
-

Dark card

-

Some quick example text to build on the card title and make up the bulk of the card's content.

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

- - Forms -

-

- - - - - - -

-
- -
-
-
-
-
-
-

Text fields

-
- - - We'll never share your email with anyone else. -
-
- -
-
- -
-
- -
-
- -
-
- - -
-
- - -
Please provide a valid value.
-
-
- -
-
- -
-
- -
-
-
-
- $ -
- -
- .00 -
-
-
-
-
-
- $ -
- -
- .00 -
-
-
-
-
-
- -
- -
- -
-
-
-
-
- -
- -
- Action - Another action - Something else here - - Separated link -
-
-
-
-
- - -
- -

Layouts

-
-
-
- -
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
- -
- -
-
-
-
- -
-
- @ -
- -
-
-
-
-
-
- - - Must be 8-20 characters long. -
-
-
-
-
-

Selects

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

Checkboxes

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

Radio buttons

-
- -
-
- -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
- -
-
- -
-
-
-
- -
-
- - + +
+
+
+
+

+ + Jumbotrons +

+

+ + + + +

+
+ +
+
+
+
+
+

Default jumbotron

+
+

Hello, world!

+

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

+
+

It uses utility classes for typography and spacing to space content out within the larger container.

+

+ Learn more +

+
+ +

Fluid jumbotron

+
+
+

Fluid jumbotron

+

This is a modified jumbotron that occupies the entire horizontal space of its parent.

+
+
+
+
+
+
+ +
+
+
+
+

+ + Cards +

+

+ + + + +

+
+ +
+
+
+
+
+

Various types of cards

+
+
+
+ This is some text within a card block. +
+
+
+
    +
  • Cras justo odio
    • +
  • Dapibus ac facilisis in
    • +
  • Vestibulum at eros
    • +
+
+
+
+

Card title

+
Card subtitle
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Card link + Another link +
+
+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
+ + Someone famous in Source Title + +
+
+
+
+
+ Featured +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
+ Featured +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+ 2 days ago +
+
+
+ Card image +
+
+ Card image cap +
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+
+

Card title

+

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little + bit longer.

+

Last updated 3 mins ago

+
+ Card image cap +
+
+ Card image cap +
+

Card title

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
    +
  • Cras justo odio
    • +
  • Dapibus ac facilisis in
    • +
  • Vestibulum at eros
    • +
+
+ Card link + Another link +
+
+
+
+ +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
+ +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
+
+
+
+

Colored cards

+
+ + + +
+
+
Header
+
+

Primary card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Secondary card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Success card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Danger card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Warning card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Info card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Light card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + + +
+
+
Header
+
+

Dark card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
+

Cards with colored borders

+
+ + +
+
+
Header
+
+

Primary card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Secondary card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Success card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Danger card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Warning card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Info card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Light card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
Header
+
+

Dark card

+

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
+
+ + +
+
+
+ +
+
+
+
+

+ + Forms +

+

+ + + + + + +

+
+ +
+
+
+
+
+
+

Text fields

+
+ + + We'll never share your email with anyone else. +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ + +
Please provide a valid value.
+
+
+ +
+
+ +
+
+ +
+
+
+
+ $ +
+ +
+ .00 +
+
+
+
+
+
+ $ +
+ +
+ .00 +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+ Action + Another action + Something else here + + Separated link +
+
+
+
+
+ + +
+ +

Layouts

+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+
+ @ +
+ +
+
+
+
+
+
+ + + Must be 8-20 characters long. +
+
+
+
+
+

Selects

+
+ + +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+ +

Checkboxes

+
+ +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +
+
+ +
+ +

Radio buttons

+
+ +
+
+ +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ + + + -
-
-
-
-

- - Badges -

-

+
+
+
+
+

+ + Badges +

+

- + - -

-
+ +

+
-
-
-
-
-
-

Contextual badges

-

+

+
+
+
+
+

Contextual badges

+

- Primary + Primary - Secondary + Secondary - Success + Success - Danger + Danger - Warning + Warning - Info + Info - Light + Light - Dark + Dark -

+

-

Pill badges

-

+

Pill badges

+

- Primary + Primary - Secondary + Secondary - Success + Success - Danger + Danger - Warning + Warning - Info + Info - Light + Light - Dark + Dark -

+

-

Links

-

+

Links

+

- Primary + Primary - Secondary + Secondary - Success + Success - Danger + Danger - Warning + Warning - Info + Info - Light + Light - Dark + Dark -

-
-
-

Badges in headings

-

Example heading New

-

Example heading New

-

Example heading New

-

Example heading New

-
Example heading New
-
Example heading New
-
-
-
-
+

+ +
+

Badges in headings

+

Example heading New

+

Example heading New

+

Example heading New

+

Example heading New

+
Example heading New
+
Example heading New
+
+ + + -
-
-
-
-

- - Alerts -

-

+
+
+
+
+

+ + Alerts +

+

- + - -

-
+ +

+
-
-
-
-
-
-

Simple alerts

-
+
+
+
+
+
+

Simple alerts

+
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
- - -
- -
- - -
-
-
-

Alerts with additional content

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

- - Popovers -

-

- - - - - - -

-
- -
-
-
-
-
-

Popovers

- -
-
-

Tooltips

- -
-
-
-
- -
-
-
-
-

- - Progress bars -

-

- - - - -

-
- -
-
-
-
-
-

Colored progress bars

-
-
Label
-
- - -
-
Label
-
- -
-
Label
-
- -
-
Label
-
- -
-
Label
-
- -
-
-

Striped progress bars

-
-
Label
-
- - -
-
Label
-
- -
-
Label
-
- -
-
Label
-
- -
-
Label
-
- -
-
-
-
- -
-
-
-
-

- - Modals -

-

- - - - -

-
- -
-
-
-
-
-
-
-
-
-
Modal title
- -
-
-

Modal body text goes here.

-
-
- - -
-
-
-
-
-
-
-
- +
+ +
+ + +
+ +
+ + + +
+
+

Alerts with additional content

+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + +
+
+
+
+

+ + Popovers +

+

+ + + + + + +

+
+ +
+
+
+
+
+

Popovers

+ +
+
+

Tooltips

+ +
+
+
+
+ +
+
+
+
+

+ + Progress bars +

+

+ + + + +

+
+ +
+
+
+
+
+

Colored progress bars

+
+
Label
+
+ + +
+
Label
+
+ +
+
Label
+
+ +
+
Label
+
+ +
+
Label
+
+ +
+
+

Striped progress bars

+
+
Label
+
+ + +
+
Label
+
+ +
+
Label
+
+ +
+
Label
+
+ +
+
Label
+
+ +
+
+
+
+ +
+
+
+
+

+ + Modals +

+

+ + + + +

+
+ +
+
+
+
+
+
+
+
+
+
Modal title
+ +
+
+

Modal body text goes here.

+
+
+ + +
+
+
+
+
+
+
+
+ {% endblock %} diff --git a/templates/index.html b/templates/index.html index 1e00d5f7..511377ff 100644 --- a/templates/index.html +++ b/templates/index.html @@ -5,7 +5,7 @@ {% block content %}
-

Rig Information Gathering System

+

Rig Information Gathering System

Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}

diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index 240fb1a1..20fb909e 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -1,33 +1,32 @@ {% extends "base_rigs.html" %} {% load widget_tweaks %} - {% block title %}Change Password{% endblock %} {% block content %} +
+

Change Password

+ {% if form.errors or supplement_form.errors %} +
+ Please correct the error(s) below. + {{form.errors}} + {{supplement_form.errors}} +
+ {% endif %} +

Please enter your old password, for security's sake, and then enter your new password twice, so we can verify you typed it in correctly.

-
-

Change Password

- {% if form.errors or supplement_form.errors %} -
- Please correct the error(s) below. - {{form.errors}} - {{supplement_form.errors}} -
- {% endif %} -

Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.

- -
-
{% csrf_token %} - {% for field in form %} -
- -
- {% render_field field class+="form-control" placeholder=field.label %} -
-
- {% endfor %} -

-
+
+
{% csrf_token %} + {% for field in form %} +
+ +
+ {% render_field field class+="form-control" placeholder=field.label %} +
+
+ {% endfor %} +

+
+
{% endblock %} diff --git a/users/templates/profile_detail.html b/users/templates/profile_detail.html index c31515b3..b45ecabf 100644 --- a/users/templates/profile_detail.html +++ b/users/templates/profile_detail.html @@ -9,26 +9,26 @@ + {% endblock %} {% block content %} -{% if not request.is_ajax and object.pk == user.pk %} -
-
-
- - Edit Profile - - - Change Password - -
-
-
-{% endif %} -
-
-
-
-
- + {% if not request.is_ajax and object.pk == user.pk %} +
+
+
+ + Edit Profile + + + Change Password +
-
-
-
-
First Name
-
{{object.first_name}}
+
+
+ {% endif %} +
+
+
+
+
+ +
+
+
+
+
First Name
+
{{object.first_name}}
-
Last Name
-
{{object.last_name}}
+
Last Name
+
{{object.last_name}}
-
Email
-
{{object.email}}
+
Email
+
{{object.email}}
-
Last Login
-
{{object.last_login|date:"d/m/Y H:i"}}
+
Last Login
+
{{object.last_login|date:"d/m/Y H:i"}}
-
Date Joined
-
{{object.date_joined|date:"d/m/Y H:i"}}
+
Date Joined
+
{{object.date_joined|date:"d/m/Y H:i"}}
-
Initials
-
{{object.initials}}
+
Initials
+
{{object.initials}}
-
Phone
-
{{object.phone|linkornone:'tel'}}
-
+
Phone
+
{{object.phone|linkornone:'tel'}}
+ +
-
- {% if not request.is_ajax and object.pk == user.pk %} -
-
-
Personal iCal Details
-
-
-
API Key
-
- {% if user.api_key %} - {{user.api_key}} - - {% else %} - No API Key Generated - {% endif %} - - {% if user.api_key %}Reset API Key{% else %}Generate API Key{% endif %} - - -
-
Calendar Options
-
-
-
- - - - - - -
-
-
-
Calendar URL
-
- {% if user.api_key %} - - -
- Click here for instructions on adding to google calendar.
- To sync from Google Calendar to mobile device, visit this page on your device and tick "RIGS Calendar". - {% else %} - 
No API Key Generated
- {% endif %} -
-
+ {% if not request.is_ajax and object.pk == user.pk %} +
+
+
Personal iCal Details
+
+
+
API Key
+
+ {% if user.api_key %} + {{user.api_key}} + + {% else %} + No API Key Generated + {% endif %} + + {% if user.api_key %}Reset API Key{% else %}Generate API Key{% endif %} + + +
+
Calendar Options
+
+
+
+ + + + + + +
+
+
+
Calendar URL
+
+ {% if user.api_key %} + + +
+ Click here for instructions on adding to google calendar.
+ To sync from Google Calendar to mobile device, visit this page on your device and tick "RIGS Calendar". + {% else %} + 
No API Key Generated
+ {% endif %} +
+
+
+
-
-
- {% endif %} -
-

Events

-{% with object.latest_events as events %} - {% include 'partials/event_table.html' %} -{% endwith %} + {% endif %} +
+

Events

+ {% with object.latest_events as events %} + {% include 'partials/event_table.html' %} + {% endwith %} {% endblock %} diff --git a/versioning/templates/activity_feed.html b/versioning/templates/activity_feed.html index a469721b..723b8a95 100644 --- a/versioning/templates/activity_feed.html +++ b/versioning/templates/activity_feed.html @@ -11,8 +11,8 @@ $('#activity_loading').slideUp(dur,function(){ $('#activity').slideDown(dur); }); - var whiteList = $.fn.tooltip.Constructor.Default.whiteList - whiteList.ins = [] + const whiteList = $.fn.tooltip.Constructor.Default.whiteList; + whiteList.ins = [] whiteList.del = [] $('#activity [data-toggle="popover"]').popover({whiteList: whiteList}); }); diff --git a/versioning/templates/partials/activity_table_body.html b/versioning/templates/partials/activity_table_body.html index c1394d3a..85d93383 100644 --- a/versioning/templates/partials/activity_table_body.html +++ b/versioning/templates/partials/activity_table_body.html @@ -1,33 +1,33 @@ {% load to_class_name from filters %}
- +
- - - - - - - + + + + + + + - {% for version in object_list %} - - - - - - - - {% endfor %} + {% for version in object_list %} + + + + + + + + {% endfor %}
DateObjectVersion IDUserChanges
DateObjectVersion IDUserChanges
{{ version.revision.date_created }}{{ version.changes.new.display_id|default:version.changes.new.pk }} | {{version.changes.new|to_class_name}}{{ version.pk }}|{{ version.revision.pk }}{{ version.revision.user.name|default:"System" }} - {% if version.changes.old == None %} - Created {{version.changes.new|to_class_name}} - {% elif version.changes.new == None %} - Deleted {{version.changes.old|to_class_name}} - {% else %} - {% include 'partials/version_changes.html' %} - {% endif %} -
{{ version.revision.date_created }}{{ version.changes.new.display_id|default:version.changes.new.pk }} | {{version.changes.new|to_class_name}}{{ version.pk }}|{{ version.revision.pk }}{{ version.revision.user.name|default:"System" }} + {% if version.changes.old == None %} + Created {{version.changes.new|to_class_name}} + {% elif version.changes.new == None %} + Deleted {{version.changes.old|to_class_name}} + {% else %} + {% include 'partials/version_changes.html' %} + {% endif %} +
diff --git a/versioning/templates/partials/version_changes.html b/versioning/templates/partials/version_changes.html index 79860ae6..b6f83071 100644 --- a/versioning/templates/partials/version_changes.html +++ b/versioning/templates/partials/version_changes.html @@ -1,6 +1,6 @@ {% if version.changes.anything_changed %} {% for change in version.changes.field_changes %} - {{ change.field.verbose_name }} + {{ change.field.verbose_name }} {% endfor %} {% for itemchange in version.changes.item_changes %}