Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / admin_logs.tpl

diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
old mode 100644 (file)
new mode 100755 (executable)
index f2939a7..9d133b1
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
@@ -12,6 +12,7 @@
        </form>
        
        <h3>$logname</h3>
-       <iframe src='$baseurl/$logname' style="width:100%; height:400px"></iframe>
+       <div style="width:100%; height:400px; overflow: auto; "><pre>$data</pre></div>
+<!--   <iframe src='$baseurl/$logname' style="width:100%; height:400px"></iframe> -->
        <!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="$clear" /></div> -->
 </div>