Skip to content

Commit

Permalink
Merge pull request #831 from flamminger/flamminger/fix/navbar
Browse files Browse the repository at this point in the history 
fix(layout): update page template for eXist-design and plain
  • Loading branch information
@duncdrum
duncdrum authored Jun 17, 2022
2 parents 535107d + df8e00d commit 7b88463
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 154 deletions.
160 changes: 86 additions & 74 deletions generators/app/templates/pages/exist-design/page.html
View file
Original file line number Diff line number Diff line change
@@ -1,82 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title data-template="config:app-title"><%- title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta data-template="config:app-meta"/>
<link rel="shortcut icon" href="resources/images/exist_icon_16x16.ico"/>
<link rel="stylesheet" type="text/css" href="resources/css/exist-2.2.css"/>
<link rel="stylesheet" type="text/css" href="resources/css/style.css"/>
<script type="text/javascript" src="resources/scripts/bootstrap.bundle.min.js"/>
</head>
<body id="grey-top">
<div class="grey-bot">
<div class="container" id="main-container">
<div class="row">
<div class="col-md-12" id="header">
<a href="/" id="logo">eXistDB</a>
</div>
</div>
<div class="row">
<nav class="navbar navbar-default" role="navigation">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="icon-bar"/>
</button>
<div class="navbar-collapse collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="dropdown" id="about">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Home</a>
<ul class="dropdown-menu">
<li>
<a href="index.html">Home</a>
</li>
</ul>
</li>
</ul>
<%_ if (mysec) { %>
<ul class="nav navbar-nav navbar-right">
<li>
<a href="../">Hello <span data-template="app:username"/>
</a>
</li>
<li>
<div data-template="app:if-attribute-set" data-template-attribute="org.exist-db.mysec.user">
<a href="index.html?logout=true" class="btn btn-default">×</a>
</div>
<div data-template="app:if-attribute-unset" data-template-attribute="org.exist-db.mysec.user">
<a data-toggle="modal" href="#loginModal" class="btn btn-default">Login</a>
</div>
</li>
<li>
</li>
</ul>
<% } -%>
</div>
</nav>
</div>
<div id="content" class="row"/>
<head>
<title data-template="config:app-title"><%- title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta data-template="config:app-meta"/>
<link rel="shortcut icon" href="resources/images/exist_icon_16x16.ico"/>
<link rel="stylesheet" type="text/css" href="resources/css/exist-2.2.css"/>
<link rel="stylesheet" type="text/css" href="resources/css/style.css"/>
<script type="text/javascript" src="resources/scripts/bootstrap.bundle.min.js"/>
</head>
<body id="grey-top">
<div class="grey-bot">
<div class="container" id="main-container">
<div class="row">
<div class="col-md-12" id="header">
<a href="/" id="logo">eXistDB</a>
</div>
</div>
<a id="poweredby" href="http://exist-db.org"/>
<div id="footer">
<div class="container">
<ul>
<li>
<a href="http://exist-db.org">eXist-db.org</a>
</li>
</ul>
<div id="copyright">
<p>Copyright eXist-db Project 2013</p>
<div class="row">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
<div class="container-fluid g-0">
<a data-template="config:app-title" class="navbar-brand" href="./index.html"><%- title %></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="index.html">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">TBA</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">TBA</a>
</li>
<li class="nav-item">
<a class="nav-link">TBA</a>
</li>
</ul>
<%_ if (mysec) { %>
<ul class="nav navbar-nav navbar-right">
<li>
<a href="../">Hello <span data-template="app:username"/>
</a>
</li>
<li>
<div data-template="app:if-attribute-set"
data-template-attribute="org.exist-db.mysec.user">
<a href="index.html?logout=true" class="btn btn-default">×</a>
</div>
<div data-template="app:if-attribute-unset"
data-template-attribute="org.exist-db.mysec.user">
<a data-toggle="modal" href="#loginModal" class="btn btn-default">Login</a>
</div>
</li>
<li>
</li>
</ul>
<% } -%>
</div>
</div>
</div>
</nav>
</div>
<%_ if (mysec) { %>
<div data-template="templates:if-parameter-unset" data-template-param="org.exist-db.mysec.user">
<div data-template="templates:include" data-template-path="templates/login-panel.html"/>
<div id="content" class="row" style="padding-top: 1.5rem"/>
</div>
</div>



<div class="container">
<div class="text-end">
<a id="poweredby" href="http://exist-db.org"/>
</div>
<div id="footer">
<ul>
<li>
<a href="http://exist-db.org">eXist-db.org</a>
</li>
</ul>
<div id="copyright">
<p>Copyright eXist-db Project 2013</p>
</div>
<% } -%>
</body>
</div>
</div>
<%_ if (mysec) { %>
<div data-template="templates:if-parameter-unset" data-template-param="org.exist-db.mysec.user">
<div data-template="templates:include" data-template-path="templates/login-panel.html"/>
</div>
<% } -%>
</body>
</html>
10 changes: 6 additions & 4 deletions generators/app/templates/pages/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<div xmlns="http://www.w3.org/1999/xhtml" data-template="templates:surround" data-template-with="templates/page.html" data-template-at="content">
<% if(apptype == 'plain'){ %>
<div class="row">
<div class="row" style="padding-top: 1.5rem">
<div class="col-md-8">
<div class="page-header">
<% } else { %>
<div class="col-md-9">
<div class="col-lg-9">
<div class="page-header">
<% } %>
<h1 data-template="config:app-title">Generated page</h1>
<% if(apptype == 'plain'){ %>
</div><% } else { %><% } %>
</div><% } else { %>
</div><% } %>
<div class="alert alert-success">
<p>
This is the entry page into your application and was generated by yeoman. It uses HTML templates for a clean separation of HTML views and application logic.</p>
Expand All @@ -25,7 +27,7 @@ <h1 data-template="config:app-title">Generated page</h1>
</div>
</div>
<% if(apptype == 'plain'){ %>
<div class="col-md-4"><% } else { %> <div class="col-md-3"><% } %>
<div class="col-md-4"><% } else { %> <div class="col-lg-3"><% } %>
<h2>Application Info</h2>
<div data-template="config:app-info" />
</div>
Expand Down
124 changes: 65 additions & 59 deletions generators/app/templates/pages/plain/page.html
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title data-template="config:app-title"><%- title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta data-template="config:app-meta"/>
<link rel="shortcut icon" href="resources/images/exist_icon_16x16.ico"/>
<link rel="stylesheet" type="text/css" href="resources/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="resources/css/style.css"/>
<script type="text/javascript" src="resources/scripts/bootstrap.bundle.min.js"/>
</head>
<body id="body">
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="icon-bar"/>
</button>
<a data-template="config:app-title" class="navbar-brand" href="./index.html"><%- title %></a>
</div>
<div class="navbar-collapse collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="dropdown" id="about">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Home</a>
<ul class="dropdown-menu">
<li>
<a href="index.html">Home</a>
</li>
</ul>
<%_ if (mysec) { %>
<ul class="nav navbar-nav navbar-right">
<li>
<a href="../">Hello <span data-template="app:username"/>
</a>
</li>
<li>
<div data-template="app:if-attribute-set" data-template-attribute="org.exist-db.mysec.user">
<a href="index.html?logout=true" class="btn btn-default">×</a>
</div>
<div data-template="app:if-attribute-unset" data-template-attribute="org.exist-db.mysec.user">
<a data-toggle="modal" href="#loginModal" class="btn btn-default">Login</a>
</div>
</li>
<li>
</li>
</ul>
<% } -%>
<head>
<title data-template="config:app-title"><%- title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta data-template="config:app-meta"/>
<link rel="shortcut icon" href="resources/images/exist_icon_16x16.ico"/>
<link rel="stylesheet" type="text/css" href="resources/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="resources/css/style.css"/>
<script type="text/javascript" src="resources/scripts/bootstrap.bundle.min.js"/>
</head>
<body id="body">
<div class="container">
<nav class="navbar navbar-expand-lg navbar-light bg-light" role="navigation">
<div class="container-fluid">
<a data-template="config:app-title" class="navbar-brand" href="./index.html"><%- title %></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="index.html">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">TBA</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">TBA</a>
</li>
<li class="nav-item">
<a class="nav-link">TBA</a>
</li>
</ul>
<%_ if (mysec) { %>
<ul class="nav navbar-nav navbar-right">
<li>
<a href="../">Hello <span data-template="app:username"/>
</a>
</li>
<li>
<div data-template="app:if-attribute-set" data-template-attribute="org.exist-db.mysec.user">
<a href="index.html?logout=true" class="btn btn-default">×</a>
</div>
<div data-template="app:if-attribute-unset" data-template-attribute="org.exist-db.mysec.user">
<a data-toggle="modal" href="#loginModal" class="btn btn-default">Login</a>
</div>
</li>
<li>
</li>
</ul>
<% } -%>
</div>
</nav>
<div id="content" class="container"/>
<footer>
<a class="poweredby" href="http://exist-db.org">
<img src="resources/images/powered-by.svg" alt="Powered by eXist-db"/>
</a>
</footer>
<%_ if (mysec) { %>
<div data-template="templates:if-parameter-unset" data-template-param="org.exist-db.mysec.user">
<div data-template="templates:include" data-template-path="templates/login-panel.html"/>
</div>
<% } -%>
</body>
</nav>
</div>
<div id="content" class="container"/>
<footer>
<div class="container text-end">
<a class="poweredby" href="http://exist-db.org">
<img src="resources/images/powered-by.svg" alt="Powered by eXist-db"/>
</a>
</div>
</footer>
<%_ if (mysec) { %>
<div data-template="templates:if-parameter-unset" data-template-param="org.exist-db.mysec.user">
<div data-template="templates:include" data-template-path="templates/login-panel.html"/>
</div>
<% } -%>
</body>
</html>
Loading

0 comments on commit 7b88463

Please sign in to comment.