Session clearing, more actions

app/assets/templates/directives/menu-row.html.haml

@@ -1,7 +1,7 @@
 .row{"ng-attr-title" => "{{desc}}", "ng-click" => "onClick($event)"}
   .column
     .left
-      .column{"ng-if" => "circle"}
+      .column{"ng-if" => "circle && (!circleAlign || circleAlign == 'left')"}
         .circle.small{"ng-class" => "circle"}
       .column{"ng-class" => "{'faded' : faded || disabled}"}
         .label
@@ -13,6 +13,9 @@
       %menu-row{"ng-repeat" => "row in subRows", "action" => "row.onClick()",
       "label" => "row.label", "subtitle" => "row.subtitle", "spinner-class" => "row.spinnerClass"}
 
+  .column{"ng-if" => "circle && circleAlign == 'right'"}
+    .circle.small{"ng-class" => "circle"}
+
   .column{"ng-if" => "hasButton"}
     .button.info{"ng-click" => "clickButton($event)", "ng-class" => "buttonClass"}
       {{buttonText}}

app/assets/templates/directives/privileges-management-modal.html.haml

@@ -20,6 +20,10 @@
                   %p {{displayInfoForAction(action)}}
                 %th{"ng-repeat" => "credential in availableCredentials"}
                   %input{"type" => "checkbox", "ng-checked" => "isCredentialRequiredForAction(action, credential)", "ng-click" => "checkboxValueChanged(action, credential)"}
+
+        .panel-section{"ng-if" => "sessionExpirey && !sessionExpired"}
+          %p You will not be asked to authenticate until {{sessionExpirey}}.
+          %a{"ng-click" => "clearSession()"} Clear Session
       .footer
         %h2 About Privileges
         .panel-section.no-bottom-pad