Misc small fixes.

static/cranefly/css/cranefly.css

@@ -760,7 +760,7 @@ footer .container .credits p{margin-bottom:0;color:#555;font-size:90%}footer .co
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;clear:none;display:block;float:none;margin:0;padding:6px 12px;color:#333;font-weight:normal;text-align:left}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a i,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link i{display:inline-block;margin-right:8px;width:16px;text-align:center}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:link .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:link .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:active .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:active .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:visited .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:visited .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:hover .label,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:hover .label{background-color:#cf402e;float:right;color:#fff;text-shadow:0 1px 0 #7c261b}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li a:hover{background-color:#555;opacity:1;filter:alpha(opacity=100);color:#fff}
-.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link{background:none;border:none;width:100%}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:hover,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:active{background:#cf402e;opacity:1;filter:alpha(opacity=100);color:#fff;text-shadow:0 1px 0 #7c261b}
+.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link{background:none;border:none;opacity:1;filter:alpha(opacity=100);width:100%}.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:hover,.navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link:active{background:#cf402e;color:#fff;text-shadow:0 1px 0 #7c261b}
 .navbar-header .navbar-inner .navbar-compact li.user-profile .dropdown-menu>li .btn-link i{position:relative;top:0}
 .navbar-header .navbar-inner .navbar-user-nav li .btn{padding:2px 8px;margin-left:8px;margin-top:13px}.navbar-header .navbar-inner .navbar-user-nav li .btn:link,.navbar-header .navbar-inner .navbar-user-nav li .btn:active,.navbar-header .navbar-inner .navbar-user-nav li .btn:hover,.navbar-header .navbar-inner .navbar-user-nav li .btn:visited{color:#fff}
 .navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger{text-shadow:0 1px 0 #902d20}.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger:hover,.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger:active,.navbar-header .navbar-inner .navbar-user-nav li .btn.btn-danger:focus{background-color:#e82c15;border-color:#d12813}
@@ -800,7 +800,7 @@ textarea{resize:vertical}
 .btn.btn-warning{background-color:#e59119;border-color:#ce8217;color:rgba(255,255,255,0.85);text-shadow:0 1px 0 #ad6704}.btn.btn-warning:hover,.btn.btn-warning:active{color:#fff}.btn.btn-warning:hover:enabled,.btn.btn-warning:active:enabled{background-color:#f89406;border-color:#df8505}
 .btn.btn-danger{background-color:#cf402e;border-color:#ba3a29;color:rgba(255,255,255,0.85);text-shadow:0 1px 0 #902d20}.btn.btn-danger:hover,.btn.btn-danger:active{color:#fff}.btn.btn-danger:hover:enabled,.btn.btn-danger:active:enabled{background-color:#e82c15;border-color:#d12813}
 .btn.btn-inverse{background-color:#333;border-color:#262626;color:rgba(255,255,255,0.85);text-shadow:0 1px 0 #0d0d0d}.btn.btn-inverse:hover,.btn.btn-inverse:active{color:#fff}.btn.btn-inverse:hover:enabled,.btn.btn-inverse:active:enabled{background-color:#262626;border-color:#1a1a1a}
-.btn.btn-link{background:none;border:none;opacity:.7;filter:alpha(opacity=70);color:#333}.btn.btn-link:hover,.btn.btn-link:active,.btn.btn-link:focus{color:#fff}.btn.btn-link:hover:enabled,.btn.btn-link:active:enabled,.btn.btn-link:focus:enabled{opacity:.9;filter:alpha(opacity=90);text-decoration:none}
+.btn.btn-link{background:none;border:none;opacity:.7;filter:alpha(opacity=70);color:#333}.btn.btn-link:hover,.btn.btn-link:active,.btn.btn-link:focus{opacity:1;filter:alpha(opacity=100)}.btn.btn-link:hover:enabled,.btn.btn-link:active:enabled,.btn.btn-link:focus:enabled{text-decoration:none}
 a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opacity=90);color:#333;text-decoration:none}
 .pagination{margin:0;padding:0}.pagination .count{margin-right:10.5px;padding:4px 0;color:#999}
 .pagination ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.pagination ul li{float:left;margin:0;margin-right:4.666666666666667px;padding:0}.pagination ul li a:link,.pagination ul li a:visited{background-color:#fff;border:1px solid #f0f0f0;border-radius:3px;padding:3px 7px;color:#999}.pagination ul li a:link i,.pagination ul li a:visited i{opacity:.55;filter:alpha(opacity=55)}
@@ -870,16 +870,17 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .index-popular-threads h3{margin:0;margin-bottom:-10px;padding:0;color:#999;font-size:17.5px;font-weight:bold}
 .index-popular-threads ul{margin:0;margin-bottom:20px;padding:0}.index-popular-threads ul li{border-bottom:1px solid #e2e2e2;padding:7px 0}.index-popular-threads ul li a:link,.index-popular-threads ul li a:active,.index-popular-threads ul li a:visited,.index-popular-threads ul li a:hover{color:#333;font-weight:bold}
 .index-popular-threads ul li .muted{font-size:10.5px}.index-popular-threads ul li .muted a:link,.index-popular-threads ul li .muted a:active,.index-popular-threads ul li .muted a:visited,.index-popular-threads ul li .muted a:hover{color:#555}
-.index-stats{margin-bottom:20px;opacity:.6;filter:alpha(opacity=60);overflow:auto;font-weight:bold}.index-stats ul li{float:left;padding:0;padding-right:20px}
+.index-stats{margin-bottom:20px;overflow:auto;color:#555;font-weight:bold}.index-stats ul li{float:left;padding:0;padding-right:20px}
 .signin-help h2{margin-bottom:0;color:#999;font-size:17.5px}
 .signin-help ul{margin-bottom:0}
-.signin-help a:link,.signin-help a:visited{opacity:.9;filter:alpha(opacity=90);color:#333;font-weight:bold}
+.signin-help a:link,.signin-help a:visited{color:#999;font-weight:bold}.signin-help a:link i,.signin-help a:visited i{display:inline-block;width:16px;text-align:center}
+.signin-help a:hover,.signin-help a:active{color:#333;text-decoration:none}
 .usercp .usercp-tabs{border:none}.usercp .usercp-tabs li{float:none;display:block;width:100%}.usercp .usercp-tabs li a:link,.usercp .usercp-tabs li a:visited{border:none;border-radius:2px 0 0 2px;float:none;display:block;width:100%;color:#555;font-weight:bold}
 .usercp .usercp-tabs li a:active,.usercp .usercp-tabs li a:hover{background-color:#3c85a3;color:#fff;text-shadow:0 1px 0 #1a3946}
 .usercp .usercp-tabs li.active a:link,.usercp .usercp-tabs li.active a:visited,.usercp .usercp-tabs li.active a:active,.usercp .usercp-tabs li.active a:hover{background-color:#cf402e;color:#fff;text-shadow:0 1px 0 #672017}
 .usercp .usercp-action .form-container{min-height:180px}
 .usercp-avatar-menu{margin-bottom:0}.usercp-avatar-menu .media-object{border-radius:5px;margin-top:14px;width:125px;height:125px}
-.usercp-avatar-menu .media-body{margin-left:153px}.usercp-avatar-menu .media-body ul.unstyled{margin-left:-13px}
+.usercp-avatar-menu .media-body{margin-left:153px}.usercp-avatar-menu .media-body ul.unstyled{margin-left:-13px}.usercp-avatar-menu .media-body ul.unstyled i{display:inline-block;width:16px;text-align:center}
 .usercp-avatar-select .usercp-avatar-gallery{margin:0 -14px;overflow:auto;padding-bottom-bottom:14px}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form{margin:0;padding:0;float:left}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar{margin:14px;padding:0}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover{opacity:1;filter:alpha(opacity=100)}.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover img{opacity:1;filter:alpha(opacity=100)}
 .usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:active img,.usercp-avatar-select .usercp-avatar-gallery .usercp-avatar-select-form .usercp-btn-avatar:hover img{border-color:#08c;-webkit-box-shadow:0 0 3px #08c;-moz-box-shadow:0 0 3px #08c;box-shadow:0 0 3px #08c}
 .usercp-avatar-crop .avatar-crop-preview{border-radius:5px;float:left;width:43.75px;height:43.75px;margin-right:14px;overflow:hidden}

static/cranefly/css/cranefly/buttons.less

@@ -12,18 +12,18 @@
     background-color: @white;
     border-color: lighten(@grayLight, 5%);
 
-  	color: @grayDark;
+    color: @grayDark;
   }
 
   &.btn-primary {
     background-color: @bluePale;
     border-color: darken(@bluePale, 5%);
 
-		color: fadeOut(@white, 15%);
+    color: fadeOut(@white, 15%);
     text-shadow: 0px 1px 0px darken(@bluePale, 15%);
 
     &:hover, &:active {
-    	color: @white;
+      color: @white;
 
       &:enabled {
         background-color: saturate(@bluePale, 20%);
@@ -36,11 +36,11 @@
     background-color: desaturate(@bluePale, 25%);
     border-color: darken(desaturate(@bluePale, 25%), 5%);
 
-		color: fadeOut(@white, 15%);
+    color: fadeOut(@white, 15%);
     text-shadow: 0px 1px 0px darken(desaturate(@bluePale, 25%), 15%);
 
     &:hover, &:active {
-    	color: @white;
+      color: @white;
 
       &:enabled {
         background-color: desaturate(@bluePale, 10%);
@@ -53,11 +53,11 @@
     background-color: desaturate(@green, 15%);
     border-color: darken(desaturate(@green, 15%), 5%);
 
-		color: fadeOut(@white, 15%);
+    color: fadeOut(@white, 15%);
     text-shadow: 0px 1px 0px darken(@green, 15%);
 
     &:hover, &:active {
-    	color: @white;
+      color: @white;
 
       &:enabled {
         background-color: @green;
@@ -70,11 +70,11 @@
     background-color: desaturate(@orange, 15%);
     border-color: darken(desaturate(@orange, 15%), 5%);
 
-		color: fadeOut(@white, 15%);
+    color: fadeOut(@white, 15%);
     text-shadow: 0px 1px 0px darken(@orange, 15%);
 
     &:hover, &:active {
-    	color: @white;
+      color: @white;
 
       &:enabled {
         background-color: @orange;
@@ -87,11 +87,11 @@
     background-color: @red;
     border-color: darken(@red, 5%);
 
-		color: fadeOut(@white, 15%);
+    color: fadeOut(@white, 15%);
     text-shadow: 0px 1px 0px darken(@red, 15%);
 
     &:hover, &:active {
-    	color: @white;
+      color: @white;
 
       &:enabled {
         background-color: saturate(@red, 20%);
@@ -104,11 +104,11 @@
     background-color: @textColor;
     border-color: darken(@textColor, 5%);
 
-		color: fadeOut(@white, 15%);
+    color: fadeOut(@white, 15%);
     text-shadow: 0px 1px 0px darken(@textColor, 15%);
 
     &:hover, &:active {
-    	color: @white;
+      color: @white;
 
       &:enabled {
         background-color: darken(@textColor, 5%);
@@ -125,10 +125,9 @@
     color: @textColor;
 
     &:hover, &:active, &:focus {
-    	color: @white;
+      .opacity(100);
 
       &:enabled {
-        .opacity(90);
 
         text-decoration: none;
       }

static/cranefly/css/cranefly/index.less

@@ -430,9 +430,9 @@
 // -------------------------
 .index-stats {
   margin-bottom: @baseLineHeight;
-  .opacity(60);
   overflow: auto;
 
+  color: @gray;
   font-weight: bold;
 
   ul {

static/cranefly/css/cranefly/navbar.less

@@ -364,11 +364,11 @@
               .btn-link {
                 background: none;
                 border: none;
+                .opacity(100);
                 width: 100%;
 
                 &:hover, &:active {
                   background: @red;
-                  .opacity(100);
 
                   color: @white;
                   text-shadow: 0px 1px 0px darken(@red, 20%);

static/cranefly/css/cranefly/signin.less

@@ -14,9 +14,19 @@
   }
 
   a:link, a:visited {
-    .opacity(90);
+    color: @grayLight;
+    font-weight: bold;
+
+    i {
+    	display: inline-block;
+    	width: 16px;
 
+    	text-align: center;
+    }
+  }
+
+  a:hover, a:active {
     color: @textColor;
-    font-weight: bold;
+    text-decoration: none;
   }
 }

static/cranefly/css/cranefly/usercp.less

@@ -63,6 +63,13 @@
 
     ul.unstyled {
       margin-left: @baseFontSize * -1 + 1px;
+
+      i {
+      	display: inline-block;
+      	width: 16px;
+
+      	text-align: center;
+      }
     }
   }
 }
@@ -96,7 +103,7 @@
             .box-shadow(0px 0px 3px @linkColor);
           }
         }
-      } 
+      }
     }
   }
 }

templates/cranefly/index.html

@@ -151,7 +151,7 @@
           <span class="tooltip-top" title="{% trans %}Threads{% endtrans %}"><i class="icon-th-list"></i> {{ monitor.threads|int|intcomma }}</span>
         </li>
         <li>
-          <span class="tooltip-top" title="{% trans %}Members{% endtrans %}"><i class="icon-user"></i> {{ monitor.users|int|intcomma }}</span>
+          <span class="tooltip-top" title="{% trans %}Members{% endtrans %}"><i class="icon-group"></i> {{ monitor.users|int|intcomma }}</span>
         </li>
         {% if settings.online_counting != 'no' %}
         <li>

templates/cranefly/layout.html

@@ -67,7 +67,7 @@
           {% if 1==2 and acl.search.can_search() and not user.is_crawler() %}
           <li><a href="{{ url('search') }}" title="{% trans %}Search Forums{% endtrans %}" class="tooltip-bottom"><i class="icon-search"></i></a></li>{% endif %}
           {% endif %}
-          <li><a href="{{ url('users') }}" title="{% trans %}Browse Users{% endtrans %}" class="tooltip-bottom"><i class="icon-user"></i></a></li>
+          <li><a href="{{ url('users') }}" title="{% trans %}Browse Users{% endtrans %}" class="tooltip-bottom"><i class="icon-group"></i></a></li>
           {% if settings.tos_url or settings.tos_content %}<li><a href="{% if settings.tos_url %}{{ settings.tos_url }}{% else %}{{ url('tos') }}{% endif %}" title="{% if settings.tos_title %}{{ settings.tos_title }}{% else %}{% trans %}Forum Terms of Service{% endtrans %}{% endif %}" class="tooltip-bottom"><i class="icon-certificate"></i></a></li>{% endif %}
           {{ hook_primary_menu_append|safe }}
         </ul>
@@ -76,7 +76,7 @@
         <ul id="fancy-user-nav" class="nav navbar-blocks navbar-compact pull-right">
           {{ hook_user_menu_important_prepend|safe }}
           {% if acl.reports.can_handle() and monitor.reported_posts %}
-          <li><a href="{{ url('reports') }}" title="{% trans %}There are unresolved reports!{% endtrans %}" class="tooltip-bottom fluid"><i class="icon-fire"></i><span class="label label-important">{{ monitor.reported_posts }}</span></a></li>
+          <li><a href="{{ url('reports') }}" title="{% trans %}There are unresolved reports!{% endtrans %}" class="tooltip-bottom fluid"><i class="icon-warning-sign"></i><span class="label label-important">{{ monitor.reported_posts }}</span></a></li>
           {% endif %}
           {% if user.alerts %}
           <li><a href="{{ url('alerts') }}" title="{% trans %}You have new notifications!{% endtrans %}" class="tooltip-bottom fluid"><i class="icon-asterisk"></i><span class="label label-important">{{ user.alerts }}</span></a></li>
@@ -92,7 +92,7 @@
               <li><a href="{{ url('usercp') }}"><i class="icon-cog"></i> {% trans %}Change options{% endtrans %}</a></li>
               <li role="presentation" class="divider"></li>
               {% if acl.reports.can_handle() %}
-              <li><a href="{{ url('reports') }}">{% if monitor.reported_posts %}<span class="label">{{ monitor.reported_posts }}</span>{% endif %}<i class="icon-fire"></i> {% trans %}Reported Posts{% endtrans %}</a></li>
+              <li><a href="{{ url('reports') }}">{% if monitor.reported_posts %}<span class="label">{{ monitor.reported_posts }}</span>{% endif %}<i class="icon-warning-sign"></i> {% trans %}Reported Posts{% endtrans %}</a></li>
               {% endif %}
               <li><a href="{{ url('alerts') }}">{% if user.alerts %}<span class="label">{{ user.alerts }}</span>{% endif %}<i class="icon-asterisk"></i> {% trans %}Notifications{% endtrans %}</a></li>
               {{ hook_user_menu_dropdown_prepend|safe }}
@@ -110,10 +110,10 @@
         <noscript>
           <ul class="nav navbar-blocks pull-right">
             {{ hook_user_menu_prepend|safe }}
-            <li><a href="{{ url('alerts') }}" title="{% if user.alerts %}{% trans %}You have new notifications!{% endtrans %}{% else %}{% trans %}Your Notifications{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-asterisk"></i>{% if user.alerts %}<span class="label label-important">{{ user.alerts }}</span>{% endif %}</a></li>
             {% if acl.reports.can_handle() %}
-            <li><a href="{{ url('reports') }}" title="{% if monitor.reported_posts %}{% trans %}There are unresolved reports!{% endtrans %}{% else %}{% trans %}Reports{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-fire"></i>{% if monitor.reported_posts %}<span class="label label-important">{{ monitor.reported_posts }}</span>{% endif %}</a></li>
+            <li><a href="{{ url('reports') }}" title="{% if monitor.reported_posts %}{% trans %}There are unresolved reports!{% endtrans %}{% else %}{% trans %}Reports{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-warning-sign"></i>{% if monitor.reported_posts %}<span class="label label-important">{{ monitor.reported_posts }}</span>{% endif %}</a></li>
             {% endif %}
+            <li><a href="{{ url('alerts') }}" title="{% if user.alerts %}{% trans %}You have new notifications!{% endtrans %}{% else %}{% trans %}Your Notifications{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-asterisk"></i>{% if user.alerts %}<span class="label label-important">{{ user.alerts }}</span>{% endif %}</a></li>
             {% if settings.enable_private_threads and acl.private_threads.can_participate() %}
             <li><a href="{{ url('private_threads') }}" title="{% if user.unread_pds %}{% trans %}There are unread Private Threads!{% endtrans %}{% else %}{% trans %}Your Private Threads{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-inbox"></i>{% if user.unread_pds %}<span class="label label-important">{{ user.unread_pds }}</span>{% endif %}</a></li>
             {% endif %}
@@ -154,7 +154,7 @@
     <ul class="breadcrumb">
       {% block breadcrumb %}<li class="first"><a href="{{ url('index') }}">{{ settings.board_name }}</a>{% endblock %}</li>
       {{ hook_foot_menu_prepend|safe }}
-      <li class="pull-right"><i class="icon-move"></i> <a href="{{ url('forum_map') }}">{% trans %}Forum Map{% endtrans %}</a></li>
+      <li class="pull-right"><i class="icon-sitemap"></i> <a href="{{ url('forum_map') }}">{% trans %}Forum Map{% endtrans %}</a></li>
       {{ hook_foot_menu_append|safe }}
     </ul>
     <hr>

templates/cranefly/usercp/options.html

@@ -28,7 +28,7 @@
       <fieldset>
         <legend>{% trans %}Forum Options{% endtrans %}</legend>
         {{ form_theme.row(form.timezone, attrs={'class': 'span9'}) }}
-        {{ form_theme.row(form.newsletters, attrs={'inline': _("Yes, I want to subscribe forum newsletter.")}) }}
+        {{ form_theme.row(form.newsletters, attrs={'inline': lang_newsletters_subscribe()}) }}
       </fieldset>
       <fieldset>
         <legend>{% trans %}Watching Threads{% endtrans %}</legend>
@@ -41,6 +41,9 @@
       <a href="{{ url('usercp') }}" class="btn">{% trans %}Cancel{% endtrans %}</a>
     </div>
   </form>
-  
+
 </div>
-{% endblock %}
+{% endblock %}
+
+{# Language strings macros #}
+{% macro lang_newsletters_subscribe() -%}{% trans %}Yes, I want to subscribe forum newsletter.{% endtrans %}{%- endmacro %}