adding styles to the templates

5 files changed, 81 insertions, 22 deletions

diff --git a/askbot/forms.py b/askbot/forms.py
index c857cd75..dc0057fc 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -388,8 +388,8 @@ class TagNamesField(forms.CharField):
                             'We ran out of space for recording the tags. '
                             'Please shorten or delete some of them.'
                         )
-        self.label = _('tags')
-        self.help_text = ungettext_lazy(
+        self.label = kwargs.get('label') or _('tags')
+        self.help_text = kwargs.get('help_text') or ungettext_lazy(
             'Tags are short keywords, with no spaces within. '
             'Up to %(max_tags)d tag can be used.',
             'Tags are short keywords, with no spaces within. '
@@ -1655,11 +1655,11 @@ class ShareQuestionForm(forms.Form):
 
 class BulkTagSubscriptionForm(forms.Form):
     date_added = forms.DateField(required=False, widget=forms.HiddenInput())
-    tags = TagNamesField()
+    tags = TagNamesField(label=_("Tags"), help_text=' ')
 
     def __init__(self, *args, **kwargs):
         from askbot.models import BulkTagSubscription, Tag, Group
         super(BulkTagSubscriptionForm, self).__init__(*args, **kwargs)
         self.fields['users'] = forms.ModelMultipleChoiceField(queryset=User.objects.all())
         if askbot_settings.GROUPS_ENABLED:
-            self.fields['groups'] = forms.ModelMultipleChoiceField(queryset=Group.objects.all())
+            self.fields['groups'] = forms.ModelMultipleChoiceField(queryset=Group.objects.exclude_personal())
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index 11f0850a..b4a41402 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -4434,3 +4434,45 @@ textarea.tipped-input {
     width: 100%;
   }
 }
+.tag-subscriptions {
+  border-spacing: 10px;
+  border-collapse: separate;
+}
+.tag-subscriptions button {
+  height: 27px;
+  font-size: 14px;
+  text-align: center;
+  text-decoration: none;
+  cursor: pointer;
+  color: #4a757f;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
+  text-shadow: 0px 1px 0px #c6d9dd;
+  -moz-text-shadow: 0px 1px 0px #c6d9dd;
+  -webkit-text-shadow: 0px 1px 0px #c6d9dd;
+  border-top: #eaf2f3 1px solid;
+  background-color: #d1e2e5;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7));
+  background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7);
+  background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7);
+  background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7);
+  background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7);
+  background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7);
+  border-radius: 4px;
+  -ms-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  -webkit-box-shadow: 1px 1px 2px #636363;
+  -moz-box-shadow: 1px 1px 2px #636363;
+  box-shadow: 1px 1px 2px #636363;
+}
+.tag-subscriptions form {
+  display: inline-block;
+}
+.tag-subscriptions .action {
+  cursor: pointer;
+  color: #4A757F;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
+  text-decoration: none;
+}
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index b993f2c2..a03d86f6 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -4281,3 +4281,23 @@ textarea.tipped-input {
         width: 100%;
     }
 }
+
+.tag-subscriptions{
+    border-spacing: 10px; 
+    border-collapse: separate;
+
+    button{
+      .button-style(27px, 14px);
+    }
+
+    form{
+      display:inline-block;
+    }
+
+    .action{
+      cursor: pointer;
+      color: #4A757F;
+      font-family: 'Open Sans Condensed', Arial, sans-serif;
+      text-decoration:none;
+    }
+}
diff --git a/askbot/templates/tags/form_bulk_tag_subscription.html b/askbot/templates/tags/form_bulk_tag_subscription.html
index e28aedf9..d588cfaf 100644
--- a/askbot/templates/tags/form_bulk_tag_subscription.html
+++ b/askbot/templates/tags/form_bulk_tag_subscription.html
@@ -1,14 +1,16 @@
 {% extends "one_column_body.html" %}
 {% import "macros.html" as macros %}
-<!-- template list_bulk_tag_subscription.html -->
-{% block title %}{% spaceless %}{{action}}{% trans %}Manage Tag subscriptions{% endtrans %}{% endspaceless %}{% endblock %}
+<!-- template form_bulk_tag_subscription.html -->
+{% block title %}{% spaceless %}{{action}} {% trans %}Tag subscriptions{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
-<h1 class="section-title">{{action}}{% trans %}Tag subscriptions{% endtrans %}</h1>
+<h1 class="section-title">{{action}} {% trans %}Tag Subscriptions{% endtrans %}</h1>
 <p>
 </p>
 <form action="." method="POST" accept-charset="utf-8">
-{{form.as_p()}}
-<p><input type="submit" value="Save"></p>
+<table border="0">
+{{form.as_table()}}
+<tr><td colspan='2' style='text-align: right;'><input type="submit" class="submit" value="Save"></td></tr>
+</table>
 </form>
 {% endblock %}
 {%block endjs%}
@@ -16,4 +18,4 @@
   {{macros.tag_autocomplete_js()}}
   </script>
 {%endblock%}
-<!-- end template list_bulk_tag_subscription.html -->
+<!-- end template form_bulk_tag_subscription.html -->
diff --git a/askbot/templates/tags/list_bulk_tag_subscription.html b/askbot/templates/tags/list_bulk_tag_subscription.html
index 5ed1d2f7..d75323a9 100644
--- a/askbot/templates/tags/list_bulk_tag_subscription.html
+++ b/askbot/templates/tags/list_bulk_tag_subscription.html
@@ -3,7 +3,7 @@
 <!-- template list_bulk_tag_subscription.html -->
 {% block title %}{% spaceless %}{% trans %}Manage Tag subscriptions{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
-<h1 class="section-title">{% trans %}Manage Tag subscriptions{% endtrans %}</h1>
+  <h1 class="section-title">{% trans %}Manage Tag subscription</a> {% endtrans %}(<a href="{% url create_bulk_tag_subscription %}">{%trans%}Create New{%endtrans%}</a>)</h1>
 <p>
 </p>
 <table class='tag-subscriptions'>
@@ -24,27 +24,22 @@
               {{
               macros.tag_list_widget(
                 subscription.tag_list(), 
-                deletable=True, 
+                deletable=False, 
                 css_class='subscribed marked-tags'
               )
               }}
-              <!--
-              <a href='#'>({% trans %}add tag{%endtrans%})</a>
-              <div class="inputs">
-                  <input id="subscribedTagInput" autocomplete="off" type="text"/>
-                  <input id="subscribedTagAdd" type="submit" value="{% trans %}add{% endtrans%}"/>
-              </div>
-              -->
             </td>
             <td>{%for user in subscription.users.all() %} <a href='{% url user_profile user.id, user.username|slugify %}'>{{user.username}},</a>{%endfor%} <a href='#'> </td>
             {% if settings.GROUPS_ENABLED %}
             <td>{%for group in subscription.groups.all() %} <a href='{% url users_by_group group.id, group.name|slugify %}'>{{group.name}}</a>{%endfor%} </td>
             {%endif%}
-            <td><a href='{% url edit_bulk_tag_subscription subscription.id %}'>{%trans%}Edit{%endtrans%}</a>&nbsp; - &nbsp;
+            <td>
+              <button type="button"><a class='action' href='{% url edit_bulk_tag_subscription subscription.id %}'>{%trans%}Edit{%endtrans%}</a></button>
               <form action="{%url delete_bulk_tag_subscription %}" method="POST" accept-charset="utf-8">
-                <input type="hidden" name="pk" value="{{subscription.id}}"/>
-                 <input type="submit" value="Delete" />
+                <input type="hidden" name="pk" value="{{subscription.id}}" />
+                <button type="submit">Delete</button>
                </form>
+             </td>
         </tr>
       {%endfor%}
     </tbody>