major changes

This commit is contained in:
ston1th 2018-02-07 21:41:54 +01:00
commit 2b56832843
83 changed files with 7760 additions and 1244 deletions

View file

@ -38,7 +38,7 @@ a.para {
h1,h2,h3,h4,h5,h6 {
font-weight: bold;
padding-top: 60px !important;
margin-top: -50px !important;
margin-top: -55px !important;
-webkit-background-clip: content-box !important;
background-clip: content-box !important;
}
@ -87,4 +87,34 @@ code {
textarea,input {
color: #e2e2e2 !important;
background-color: #444444 !important;
}
.menu-search-bar {
padding-top: 4px;
}
.menu-search-input {
background-color: #2f2f2f !important;
}
html, body, .container, .content {
height: 100% !important;
}
.container, .content {
position: relative;
}
.proper-content {
padding-top: 40px;
}
.wrapper {
min-height: 100%;
height: auto !important;
height: 100%;
margin: 0 auto -60px;
}
.push {
height: 60px;
}
.footer-wrapper {
position: relative;
padding-top: 20px;
height: 50px;
color: #888888;
}

View file

@ -2,10 +2,10 @@
<html>
<head>
<title>GoWiki | {{.Title}}</title>
<link rel="stylesheet" type="text/css" href="/bootstrap.css" mdeia="screen" integrity="sha256-KC5lAzGRWwscU0sTmXtd8ka5mt7Vk8a0L5JqOhwA28s="></link>
<link rel="stylesheet" type="text/css" href="/custom.css" integrity="sha256-uAIARpL4VhLyhfuh5bS4YWjdcAvN+KjjTli9S8Ud8O4="></link>
<link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-KC5lAzGRWwscU0sTmXtd8ka5mt7Vk8a0L5JqOhwA28s="></link>
<link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-gOyQhDAZKjv7dAP8YCFkpN+Hgg7JAfK8pZsZz4+bqXA="></link>
</head>
<body style="padding-top:50px">
<body>
<div class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
@ -17,13 +17,32 @@
</div>
</div>
<div class="container">
{{if .Msg}}
<div class="alert alert-danger" style="margin-top:20px">
<h4>Error!</h4>
<p>{{.Msg}}</p>
</div>
{{end}}
{{template "body" .}}
<div class="content">
<div class="wrapper">
<div id="back-to-top" class="proper-content">
{{if .Msg}}
<div class="alert alert-danger" style="margin-top:30px">
<h4>Error!</h4>
<p>{{.Msg}}</p>
</div>
{{end}}
{{template "body" .}}
</div>
<div class="push"></div>
</div>
<div class="footer-wrapper">
<footer>
<div class="row">
<div class="col-lg-12">
<ul class="list-unstyled">
<li class="pull-right"><a href="#back-to-top">Back to top</a></li>
<li>© 2017 GoWiki {{.Version}} Request: <strong>{{.Time}}ms</strong></li>
</ul>
</div>
</div>
</footer>
</div>
</div>
</div>
</body>
</html>

View file

@ -1,20 +1,33 @@
{{define "menu"}}
{{if .Login}}
<ul class="nav navbar-nav">
<li><a href="/wiki/Index">
Index
</a></li>
<li><a href="/search">
Search
</a></li>
<li><a href="/all">
All
All Articles
</a></li>
{{if .Login}}
<li><a href="/new">
New
New Article
</a></li>
{{end}}
<li><a href="/snippets">
Snippets
</a></li>
</ul>
<form class="navbar-form navbar-left menu-search-bar" role="search" method="post" action="/search">
<input type="hidden" name="token" value="{{.Token}}">
<div class="form-group">
<div class="input-group">
<input type="text" class="form-control input-sm menu-search-input" placeholder="Search" name="search" value="{{.Search}}">
<span class="input-group-btn">
<button class="btn btn-sm btn-info" type="submit" name="submit" value="Search">Search</button>
</span>
</div>
</div>
</form>
<ul class="nav navbar-nav navbar-right">
{{if .Login}}
{{if .Admin}}
<li><a href="/users">
Users
@ -27,23 +40,10 @@
<li><a href="/logout">
Logout
</a></li>
</ul>
{{else}}
<ul class="nav navbar-nav">
<li><a href="/wiki/Index">
Index
</a></li>
<li><a href="/search">
Search
</a></li>
<li><a href="/all">
All
</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="/login">
Login
</a></li>
{{end}}
</ul>
{{end}}
{{end}}

View file

@ -9,11 +9,13 @@
<input type="hidden" name="token" value="{{.Token}}">
<fieldset>
<div class="form-group">
<div class="col-lg-8">
<input type="text" class="form-control input-sm" placeholder="Search" name="search" value="{{.Search}}" autofocus>
</div>
<div class="col-lg-4">
<button class="btn btn-sm btn-primary" type="submit" name="submit" value="Search">Search</button>
<div class="col-xs-8">
<div class="input-group">
<input type="text" class="form-control input-sm" placeholder="Search" name="search" value="{{.Search}}" autofocus>
<span class="input-group-btn">
<button class="btn btn-sm btn-info" type="submit" name="submit" value="Search">Search</button>
</span>
</div>
</div>
</div>
</fieldset>

View file

@ -1,4 +1,10 @@
{{define "body"}}
{{if .Editor}}
<div class="alert alert-warning" style="margin-top:30px">
<h4>Warning!</h4>
<p><strong>{{.Editor.Username}}</strong> is editing this page since {{.Editor.Time}}</p>
</div>
{{end}}
<div class="page-header">
<div class="row">
<h2>{{.BodyTitle}}</h2>
@ -33,7 +39,7 @@
<div class="form-group">
<div class="col-xs-11 col-xs-offset-1">
<button class="btn btn-sm btn-primary" type="submit" name="submit" value="Submit">Submit</button>
<a href="/wiki/{{.Data.LinkTitle}}" class="btn btn-sm btn-default">Back</a>
<button class="btn btn-sm btn-default" type="submit" name="submit" value="Back">Back</button>
</div>
</div>
</fieldset>