diff options
-rw-r--r-- | hyperkitty/static/css/hyperkitty.css | 103 | ||||
-rw-r--r-- | hyperkitty/static/js/hyperkitty.js | 2 | ||||
-rw-r--r-- | hyperkitty/templates/message.html | 2 | ||||
-rw-r--r-- | hyperkitty/templates/recent_activities.html | 6 | ||||
-rw-r--r-- | hyperkitty/templates/thread.html | 2 | ||||
-rw-r--r-- | hyperkitty/templates/threads/right_col.html | 16 | ||||
-rw-r--r-- | hyperkitty/templates/threads/summary_thread.html | 4 | ||||
-rw-r--r-- | hyperkitty/templates/threads/summary_thread_large.html | 10 | ||||
-rw-r--r-- | hyperkitty/templates/threads/tags.html | 2 |
9 files changed, 45 insertions, 102 deletions
diff --git a/hyperkitty/static/css/hyperkitty.css b/hyperkitty/static/css/hyperkitty.css index 9d5b724..e7f14e0 100644 --- a/hyperkitty/static/css/hyperkitty.css +++ b/hyperkitty/static/css/hyperkitty.css @@ -243,34 +243,8 @@ form.likeform { min-height: 50px; } -.list_nav { - float: left; - list-style: none; - margin: 0; - padding: 5px 0 0 0; -} - -.list_nav li { - float: left; - margin-left: 20px; -} - - -#top_right { - position: absolute; - right: 20px; - bottom: 0; - color: rgb(102, 102, 102); -} - -#top_right li { - margin-left:10px; -} - -#page_date { - font-size: 150%; -} +/* Search box */ #searchbox { text-align:right; @@ -311,9 +285,9 @@ form.likeform { } -#top_discussion, -#discussion_by_topic, -#most_active, +#top-discussion, +#discussion-by-topic, +#most-active, #discussion-maker { padding: 1em; padding-bottom: 0; @@ -421,7 +395,7 @@ form.likeform { margin: 2em 0 2em 0; } -.thread_id { +.thread-id { font-weight: bold; font-size: 125%; color: rgb(102, 102, 102); @@ -429,45 +403,45 @@ form.likeform { padding-right: 10px; } -.thread_title { +.thread-title { font-weight: bold; font-size: 125%; } -.thread_date { +.thread-date { font-style: italic; font-size: 70%; color: rgb(128, 0, 0); } -.thread_info { +.thread-info { text-align:right; clear: both; margin-left: 46px; } -.thread_info .tags { +.thread-info .tags { display: inline; margin-right: 1em; } -.thread_info .participant { +.thread-info .participant { margin-right: 1em; } -.thread_info .discussion { +.thread-info .discussion { margin-right: 2em; } -.thread_info .thread-show { +.thread-info .thread-show { padding-top: 2px; padding-bottom: 2px; margin-left: 2em; } -.thread_content { +.thread-content { margin-top: 0.5em; } -.thread_content .gravatar { +.thread-content .gravatar { float: left; } -.thread_content .thread_email { +.thread-content .thread-email { display: block; margin-left: 46px; margin-bottom: 5px; @@ -501,13 +475,13 @@ form.likeform { white-space: pre; } -.thread_email .expander.collapsed { +.thread-email .expander.collapsed { white-space: normal; } /* -.thread_email span.read-more a, -.thread_email span.read-less a { +.thread-email span.read-more a, +.thread-email span.read-less a { display: block; float: right; margin-top: 0.5em; @@ -661,37 +635,6 @@ a.attachments { background-image: url('../img/button_newer.png'); } -#thread_nav{ - margin:auto; - width:100%; - text-align:center; -} - -#thread_nav * { - vertical-align: middle; -} - -#thread_nav .thread_title{ - margin:auto; - width: 50%; -} - -#thread_nav br { - margin-top: 10px; -} - -#thread_nav .thread_info { - margin-top:10px; - margin-bottom:10px; - font-size: 70%; - font-weight: normal; - text-align: center; -} - -#thread_nav .thread_info li { - margin-left:3em; -} - #olderhread, #newewthread { font-size: 70%; color: rgb(167, 169, 172); @@ -703,17 +646,17 @@ a.attachments { margin-right: 20px; } -#thread_overview_info { +#thread-overview-info { float: right; } /* Thread general information column */ -.days_num { +.days-num { font-size: 200%; display: inline-block; } -.days_text { +.days-text { font-size: 70%; display: inline-block; margin-right: 2em; @@ -742,7 +685,7 @@ a.attachments { margin-top: 2em; } -#tag_title { +#tag-title { color: rgb(77, 77, 77); text-transform: uppercase; } @@ -758,7 +701,7 @@ a.attachments { margin-left: 5px; } -#add_tag { +#add-tag { margin-top: 0.3em; } diff --git a/hyperkitty/static/js/hyperkitty.js b/hyperkitty/static/js/hyperkitty.js index d96dfb0..f207254 100644 --- a/hyperkitty/static/js/hyperkitty.js +++ b/hyperkitty/static/js/hyperkitty.js @@ -73,7 +73,7 @@ function setup_vote() { */ function setup_add_tag() { - $("#add_tag_form").submit( function () { + $("#add-tag-form").submit( function () { $.ajax({ type: "POST", dataType: "json", diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html index 3a19268..800162b 100644 --- a/hyperkitty/templates/message.html +++ b/hyperkitty/templates/message.html @@ -23,7 +23,7 @@ <h1>{{ message.subject }}</h1> </div> - <section id="thread_content"> + <section id="thread-content"> {% include 'messages/message.html' with email=message unfolded='True' %} </section> diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html index 0daa6e3..ad75253 100644 --- a/hyperkitty/templates/recent_activities.html +++ b/hyperkitty/templates/recent_activities.html @@ -33,7 +33,7 @@ <div class="row-fluid"> <div class="span6"> - <section id="most_active"> + <section id="most-active"> <h2>Recently active discussions</h2> {% for thread in most_active_threads %} {% include "threads/summary_thread.html" with counter=forloop.counter %} @@ -42,7 +42,7 @@ </div> <div class="span6"> - <section id="top_discussion"> + <section id="top-discussion"> <h2>Top discussions the last 30 days</h2> {% for thread in top_threads %} {% include "threads/summary_thread.html" with counter=forloop.counter %} @@ -86,7 +86,7 @@ <div class="span6"> {% if threads_per_category %} - <section id="discussion_by_topic"> + <section id="discussion-by-topic"> <h2>Discussion by topic the last 30 days</h2> {% for category, thread in threads_per_category.items %} <div> diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index 41cee97..6c59d7a 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -32,7 +32,7 @@ <div class="span9"> <!-- main section, the email thread --> - <section id="thread_content"> + <section id="thread-content"> <!-- Start first email --> {% include 'messages/message.html' with email=first_mail unfolded='True' %} diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html index 15a5fec..7c34c18 100644 --- a/hyperkitty/templates/threads/right_col.html +++ b/hyperkitty/templates/threads/right_col.html @@ -2,21 +2,21 @@ {% load hk_generic %} <!-- right column --> -<section id="thread_overview_info"> +<section id="thread-overview-info"> <!-- Start dates --> - <div id="thread_date_info" class="row-fluid"> - <div class="days_num"> + <div id="thread-date-info" class="row-fluid"> + <div class="days-num"> {{ days_inactive }} </div> - <div class="days_text"> + <div class="days-text"> days <br /> inactive </div> - <div class="days_num"> + <div class="days-num"> {{ days_old }} </div> - <div class="days_text"> + <div class="days-text"> days <br /> old @@ -35,8 +35,8 @@ <div id="tags"> {% include 'threads/tags.html' %} </div> - <div id="add_tag"> - <form id="add_tag_form" name="addtag" method="post" + <div id="add-tag"> + <form id="add-tag-form" name="addtag" method="post" action="{% url add_tag mlist_fqdn=mlist.name, threadid=threadid %}"> {% csrf_token %} {{ addtag_form.as_p }} diff --git a/hyperkitty/templates/threads/summary_thread.html b/hyperkitty/templates/threads/summary_thread.html index 578b051..f6bd1d9 100644 --- a/hyperkitty/templates/threads/summary_thread.html +++ b/hyperkitty/templates/threads/summary_thread.html @@ -2,8 +2,8 @@ {% load storm %} <div class="thread"> - <span class="thread_id">#{{counter}}</span> - <span class="thread_title"><a name="{{thread.thread_id}}" + <span class="thread-id">#{{counter}}</span> + <span class="thread-title"><a name="{{thread.thread_id}}" href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}" >{{ thread.subject|strip_subject:mlist }}</a></span> <div class="thread_stats"> diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html index b42f76d..ad10a27 100644 --- a/hyperkitty/templates/threads/summary_thread_large.html +++ b/hyperkitty/templates/threads/summary_thread_large.html @@ -4,12 +4,12 @@ <div class="thread"> <div class="{% if thread.favorite %}saved{% else %}notsaved{% endif %}"> - <span class="thread_title"><a name="{{thread.thread_id}}" + <span class="thread-title"><a name="{{thread.thread_id}}" href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}" >{{ thread.starting_email.subject|strip_subject:mlist }}</a></span> - <span class="thread_date">{{thread.date_active|timesince }}</span> + <span class="thread-date">{{thread.date_active|timesince }}</span> </div> - <div class="thread_content"> + <div class="thread-content"> {% if thread.category_tag %} <div class="inline-block type type_{{thread.category_tag}}"> <a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category_tag %}" @@ -29,13 +29,13 @@ {% endif %} {{ thread.starting_email.sender_name|escapeemail }} </div> - <div class="thread_email"> + <div class="thread-email"> <span class="expander collapsed"> {{ thread.starting_email.content|urlizetrunc:76|escapeemail }} </span> </div> </div> - <div class="thread_info"> + <div class="thread-info"> <div class="tags"> {% if thread.tags|length %} Tags: diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html index df0bbde..68fabf2 100644 --- a/hyperkitty/templates/threads/tags.html +++ b/hyperkitty/templates/threads/tags.html @@ -1,4 +1,4 @@ - <span id="tag_title">tags </span>({{tags|length}}) + <span id="tag-title">tags </span>({{tags|length}}) {% if tags|length %} <ul class="inline"> {% for tag in tags %} |