Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mordernizing demo #4

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4703b54
Mordernizing demo
karma4u101 Nov 8, 2017
5642e1a
Mordernizing demo
karma4u101 Nov 8, 2017
c2e8d96
Merge branch 'modernizing' of https://github.com/lift/examples into m…
karma4u101 Nov 19, 2017
8a759ad
Working on Interactive Stuff
karma4u101 Nov 25, 2017
db8c188
Working on the persistence section
karma4u101 Dec 3, 2017
587fba1
Persistence section
karma4u101 Dec 3, 2017
c60f145
Merge branch 'modernizing' of https://github.com/lift/examples into m…
karma4u101 Dec 10, 2017
39854d8
Bootstrapifying
karma4u101 Dec 29, 2017
4fa7200
Templating / Web Services
karma4u101 Dec 31, 2017
ab28423
Localization and Menues
karma4u101 Jan 1, 2018
0bcbc0c
WIP Misc code
karma4u101 Jan 14, 2018
4378e68
Updating build to use newely released Lift v3.2 and FoBo v2.0.
karma4u101 Feb 1, 2018
66e39a3
WIP Misc code
karma4u101 Feb 3, 2018
492e363
WIP Misc code
karma4u101 Feb 4, 2018
20a2eff
WIP Misc code
karma4u101 Feb 10, 2018
4920181
Adding messages tag to top of page.
karma4u101 Jul 29, 2018
4c936a2
Updating build to Lift 3.3
karma4u101 Jul 29, 2018
24087ce
Adding div selector page and other updates.
karma4u101 Aug 7, 2018
137d6c1
Adding wiki page and updated a bunch of other stuff
karma4u101 Aug 12, 2018
59e4565
Converting bind and choceTemplate code
karma4u101 Sep 1, 2018
7a3245b
Misc code updates
karma4u101 Sep 8, 2018
26ab2bf
Using FoBo's Bootstrap breadCrumb snippet function.
karma4u101 Dec 2, 2018
eb8f1f0
Clean up
karma4u101 Dec 2, 2018
38687ae
Addin cache busting of resouces using build info
karma4u101 Dec 21, 2018
1383c8a
Clean up and formating
karma4u101 Dec 26, 2018
746aedb
Building using Scala 2.12
karma4u101 Dec 26, 2018
7f831e7
Adding top nav for use on tablet/mobile view
karma4u101 Dec 30, 2018
46a7563
Some cleanup
karma4u101 Dec 30, 2018
a1edaed
Some cleanup
karma4u101 Dec 30, 2018
7945dd4
Adding BSLocInfo to MenuInfo
karma4u101 Jan 1, 2019
88b469c
updating dependencies
karma4u101 Jan 3, 2019
fd2b748
Using webjars to get resources
karma4u101 Jan 5, 2019
81d7c0f
Adjusting webjar versions.
karma4u101 Jan 5, 2019
7c50795
Adjusting webjar versions.
karma4u101 Jan 5, 2019
943d8d8
Cleanup
karma4u101 Feb 10, 2019
0145f50
Merge branch 'modernizing' of https://github.com/lift/examples into m…
karma4u101 Feb 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adding wiki page and updated a bunch of other stuff
  • Loading branch information
karma4u101 committed Aug 12, 2018
commit 137d6c13077e71fc544f3836417e0538dfca5306
Original file line number Diff line number Diff line change
@@ -142,10 +142,10 @@ object WikiStuff extends Loc[WikiLoc] {

val texMarkRefLink = <span>&nbsp;<a href="https://txstyle.org/" target="_blank">Textile Markup Reference</a><br /></span>

val cancelLink = <a href={action}>Cancel</a>
val cancelLink = <a href={action} class="btn btn-secondary">Cancel</a>
val textarea = r.entry.toForm

val submitButton = SHtml.submit(isNew ? "Add" | "Edit", () => r.save)
val submitButton = SHtml.submit(isNew ? "Add" | "Edit", () => r.save, "class" -> "btn btn-primary")

<form method="post" action={action}>{ // the form tag
message ++
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ class ValidateSession {
LoginStuff(true)
S.notice("Your session is validated")
RedirectTo("/login/index")
})
}, "class" -> "btn btn-outline-primary")
}
}
}
8 changes: 4 additions & 4 deletions combo/example/src/main/webapp/ajax-form.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>AJAX Form Update</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,16 +17,16 @@ <h2>AJAX Form Update</h2>
<li class="breadcrumb-item">
<a href="interactive.html">Interactive Stuff</a>
</li>
<li class="breadcrumb-item active" aria-current="page">AJAX Form Update</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

<div id="stateForm">Choose city and state:</div>

<div id="wrappedNoticeAtHead">
<div data-lift="Msgs"></div>
</div>

<div id="stateForm">Choose city and state:</div>

<div data-lift="AjaxForm?form=post">
<div class="form-group form-row">
<label for="state" class="col-form-label">State:</label>
4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/ajax.html
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
<head_merge>
<script id="jquery-migrate" src="/classpath/fobo/jquery-migrate.js" type="text/javascript"></script>
</head_merge>
<h2>AJAX Samples</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -23,7 +23,7 @@ <h2>AJAX Samples</h2>
<li class="breadcrumb-item">
<a href="interactive.html">Interactive Stuff</a>
</li>
<li class="breadcrumb-item active" aria-current="page">AJAX Samples</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/arc.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Arc Challenge #1</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Arc Challenge #1</h2>
<li class="breadcrumb-item">
<a href="misc.html">Misc code</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Arc Challenge #1</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/async_rest.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Async REST</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Async REST</h2>
<li class="breadcrumb-item">
<a href="misc.html">Misc code</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Async REST</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/chat.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Comet Chat</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Comet Chat</h2>
<li class="breadcrumb-item">
<a href="interactive.html">Interactive Stuff</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Comet Chat</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/database.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Database</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Database</h2>
<li class="breadcrumb-item">
<a href="persistence.html">Persistence</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Database</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/file_upload.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>File Upload</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>File Upload</h2>
<li class="breadcrumb-item">
<a href="misc.html">Misc code</a>
</li>
<li class="breadcrumb-item active" aria-current="page">File Upload</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/form_ajax.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Ajax and Forms</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Ajax and Forms</h2>
<li class="breadcrumb-item">
<a href="interactive.html">Interactive Stuff</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Ajax and Forms</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/guess.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Number Guessing</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Number Guessing</h2>
<li class="breadcrumb-item">
<a href="misc.html">Misc code</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Number Guessing</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

2 changes: 1 addition & 1 deletion combo/example/src/main/webapp/index.html
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ <h2>Welcome to the
<i>Lift</i> Web Framework</h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item active" aria-current="page">Home</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/interactive.html
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Interactive Stuff</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Interactive Stuff</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/invoice_wiring.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>Wiring Invoice</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -17,7 +17,7 @@ <h2>Wiring Invoice</h2>
<li class="breadcrumb-item">
<a href="misc.html">Misc code</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Wiring Invoice</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

5 changes: 2 additions & 3 deletions combo/example/src/main/webapp/json.html
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">

<h2>JSON Samples</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -18,7 +17,7 @@ <h2>JSON Samples</h2>
<li class="breadcrumb-item">
<a href="interactive.html">Interactive Stuff</a>
</li>
<li class="breadcrumb-item active" aria-current="page">JSON Samples</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/json_more.html
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

<body data-lift-content-id="main">
<div id="main" data-lift="surround?with=default2;at=content">
<h2>More JSON Samples</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
@@ -14,7 +14,7 @@ <h2>More JSON Samples</h2>
<li class="breadcrumb-item">
<a href="interactive.html">Interactive Stuff</a>
</li>
<li class="breadcrumb-item active" aria-current="page">More JSON Samples</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

5 changes: 2 additions & 3 deletions combo/example/src/main/webapp/lang.html
Original file line number Diff line number Diff line change
@@ -7,15 +7,14 @@
</head>

<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/lang_ca.html
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/lang_de.html
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/lang_en_CA.html
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/lang_en_US.html
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/lang_es.html
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

4 changes: 2 additions & 2 deletions combo/example/src/main/webapp/lang_fr.html
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
<body data-lift-content-id="main">

<div id="main" data-lift="surround?with=default2;at=content">
<h2>Localization</h2>
<h2><span data-lift="Menu.title">%*%</span></h2>
<nav aria-label="breadcrumb" role="navigation">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="index.html">Home</a>
</li>
<li class="breadcrumb-item active" aria-current="page">Localization</li>
<li class="breadcrumb-item active" aria-current="page"><span data-lift="Menu.title">%*%</span></li>
</ol>
</nav>

Loading