From 40741bfedaa0d67d5ad9fa31f9f1d60ab13e0d40 Mon Sep 17 00:00:00 2001
From: Osile <mo@onlinestage4you.de>
Date: Sun, 14 Oct 2012 21:06:21 +0200
Subject: Known Bug: "Learn More" doesn't work
---
module/web/static/css/default/settings.less | 22 ++++++++++
module/web/templates/default/base.html | 1 +
module/web/templates/default/settings.html | 62 ++++++++++++++---------------
3 files changed, 53 insertions(+), 32 deletions(-)
(limited to 'module')
diff --git a/module/web/static/css/default/settings.less b/module/web/static/css/default/settings.less
index 7e702dc58..5d0181485 100644
--- a/module/web/static/css/default/settings.less
+++ b/module/web/static/css/default/settings.less
@@ -9,4 +9,26 @@
margin-bottom: 20px;
min-height: 20px;
padding: 19px;
+}
+.heroless{
+background-color: #eeeeee;
+padding: 10px;
+margin-bottom: 10px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.heroless h1 {
+ margin-bottom: 0;
+ font-size: 40px;
+ line-height: 1;
+ letter-spacing: -1px;
+ color: inherit;
+}
+
+.heroless p {
+ font-size: 18px;
+ font-weight: 200;
+ line-height: 30px;
+ color: inherit;
}
\ No newline at end of file
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 99b5b11ff..5fc47259d 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -12,6 +12,7 @@
<link href="static/css/bootstrap.css" rel="stylesheet" type="text/css"/>
<link href="static/css/font.css" rel="stylesheet" type="text/css"/>
<link href="static/css/default/style.less" rel="stylesheet/less" type="text/css" media="screen"/>
+ <link href="static/css/default/settings.less" rel="stylesheet/less" type="text/css" media="all"/>
<script src="static/js/libs/less-1.3.0.min.js" type="text/javascript"></script>
<script type="text/javascript" data-main="static/js/default" src="static/js/libs/require-2.0.6.js"></script>
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index ef12cc7d8..a200d7d51 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -1,10 +1,11 @@
{% extends 'default/base.html' %}
{% block title %}{{ _("Config") }} - {{ super() }} {% endblock %}
-{% block subtitle %}{{ _("Config") }}{% endblock %}
+{% block subtitle %}{{ _("Config") }}
+{% endblock %}
{% block head %}
-<link href="static/css/default/settings.less" rel="stylesheet/less" type="text/css" media="screen"/>
+
{% endblock %}
@@ -41,36 +42,33 @@
</div>
</div>
<!-- Info Popup -->
- <div class="modal" id="info" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3>Info Popup</h3>
- </div>
- <div class="modal-body">
- <h4>General</h4>
+<div class="modal hide fade in" id="info" >
+ <div class="modal-header">
+ <button type="button" class="close" >×</button>
+ <h3>Info Popup</h3>
+ </div>
+ <div class="modal-body">
+ <h4>General</h4>
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
-
- <h4>And...</h4>
- <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
- <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
- <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
- <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
- <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
- <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
- </div>
- <div class="modal-footer">
- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
- </div>
- </div>
- <div class="span10" style="margin-top: 10px ">
- <div class="hero-unit">
- <h1>Example Settings</h1>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod</p>
- <p>
- <a class="btn btn-primary btn-large" role="button" href="#info" data-toggle="modal">Learn more</a>
- </p>
- </div>
-
+
+ <h4>And...</h4>
+ <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
+
+ </div>
+ <div class="modal-footer">
+ <button class="btn" >Close</button>
+ </div>
+ </div>
+ <!-- End Info Popup -->
+ <div class="span10" style="margin-top: 10px ">
+<div class="heroless">
+ <h1>Example Settings</h1>
+ <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod</p>
+ <p>
+ <a class="btn btn-primary btn-large" data-keyboard="true" data-backdrop="true" data-controls-modal="leave_modal">Learn more</a>
+ </p>
+ </div>
+
@@ -114,7 +112,7 @@
</div>
</div>
<script src="static/js/libs/jquery-1.8.0.js"></script>
-<script src="static/js/libs/bootstrap-2.1.1.js"></script>
+<!--<script src="static/js/libs/bootstrap-2.1.1.js"></script>-->
<script type="text/javascript">
$(".bnmaxspeed").click(function () {
--
cgit v1.2.3