From c2507e95ce6cfaa0c7b1f227b608a0716f43d74b Mon Sep 17 00:00:00 2001
From: Osile <mo@onlinestage4you.de>
Date: Sun, 14 Oct 2012 15:37:04 +0200
Subject: Settings Header neu + css ausgelagert

---
 module/web/static/css/default/style.less   | 12 ----------
 module/web/templates/default/settings.html | 35 +++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 13 deletions(-)

(limited to 'module/web')

diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less
index 49d859dd2..1df51751a 100644
--- a/module/web/static/css/default/style.less
+++ b/module/web/static/css/default/style.less
@@ -437,15 +437,3 @@ footer h2 {
 .file-row.first {
   width: 50%;
 }
-/*
-	Settings
-*/
-.setmenu{
-	 background-color: #F5F5F5;
-    border: 1px solid #E3E3E3;
-    border-radius: 4px 4px 4px 4px;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
-    margin-bottom: 20px;
-    min-height: 20px;
-    padding: 19px;
-}
\ No newline at end of file
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 2b3033ffc..3efc1b7d0 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -4,6 +4,8 @@
 {% block subtitle %}{{ _("Config") }}{% endblock %}
 
 {% block head %}
+<link href="static/css/default/settings.less" rel="stylesheet/less" type="text/css" media="screen"/>
+	
 	<script type="text/javascript">
 		
    $(".bnmaxspeed").click(function () {    
@@ -61,7 +63,38 @@
 			</div>
 		</div>
 		<div class="span10" style="margin-top: 10px ">
-	<h1>Example Settings</h1>
+			<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" data-target="#info" role="button" date-toggle="modal">Learn more</a>
+			  </p>
+			</div>
+	
+			<!-- Info Popup -->
+			<div class="modal hide fade" id="info" tabindex="-1" role="dialog" aria-labelledby="Info" 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>
+          <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="well" style="margin-top: 10px "> 
 				<form class="form-horizontal">
 					<div class="control-group">
-- 
cgit v1.2.3