From 2adb74c971e7a6e86bb6c155f98cc25781ff8d3e Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sat, 30 Aug 2014 15:53:13 -0400
Subject: [PATCH] Make log level configurable with -Dlog.level, default to
 INFO.  Thanks @pitpalme.

---
 .../Java/masterpassword-android/AndroidManifest.xml           | 3 ++-
 .../Java/masterpassword-cli/src/main/resources/logback.xml    | 4 ++--
 .../Java/masterpassword-gui/src/main/resources/logback.xml    | 4 ++--
 Site/2013-05/css/main.css                                     | 3 ---
 Site/2013-05/index.html                                       | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
index e844b6f8..1069c8bb 100644
--- a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
+++ b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
@@ -18,7 +18,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".UsersActivity" />
     </application>
-
+    
 </manifest>
 
diff --git a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
index a5c492fa..5b08fdbe 100644
--- a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
@@ -1,4 +1,4 @@
-<configuration scan="true">
+<configuration scan="false">
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
@@ -6,7 +6,7 @@
         </layout>
     </appender>
 
-    <logger name="com.lyndir" level="TRACE" />
+    <logger name="com.lyndir" level="${log.level:-INFO}" />
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
index 37906259..5b08fdbe 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
@@ -1,4 +1,4 @@
-<configuration scan="true">
+<configuration scan="false">
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
@@ -6,7 +6,7 @@
         </layout>
     </appender>
 
-    <logger name="com.lyndir" level="INFO" />
+    <logger name="com.lyndir" level="${log.level:-INFO}" />
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />
diff --git a/Site/2013-05/css/main.css b/Site/2013-05/css/main.css
index d3f41882..7aedb882 100644
--- a/Site/2013-05/css/main.css
+++ b/Site/2013-05/css/main.css
@@ -23,8 +23,6 @@ a:link:hover {
 }
 a .popup {
     display: none;
-    background: rgba(0, 0, 0, 0.5);
-    border: 1px solid;
     border-radius: 5px;
     color: #AAA;
 
@@ -35,7 +33,6 @@ a .popup {
     max-width: inherit;
     max-height: 400px;
     margin-right: -100px;
-    margin-bottom: 20px;
     padding: 8px;
 }
 a:hover .popup {
diff --git a/Site/2013-05/index.html b/Site/2013-05/index.html
index 88b1c4f1..9ac50c5d 100644
--- a/Site/2013-05/index.html
+++ b/Site/2013-05/index.html
@@ -14,7 +14,7 @@
         <link rel="shortcut icon" href="img/favicon.png" type="image/x-png" />
         <link rel="stylesheet" href="css/bootstrap.min.css">
         <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
-        <link rel="stylesheet" href="css/main.css?4">
+        <link rel="stylesheet" href="css/main.css?5">
 
         <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <script src="js/vendor/prefixfree.min.js"></script>