-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #555 from framework-one/improve-included-site-and-…
…examples Update included web app layout
- Loading branch information
Showing
3 changed files
with
36 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,29 @@ | ||
| <html> | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <title>FW/1 - Framework One - Examples</title> | ||
| <base href="<cfoutput>#iif( CGI.HTTPS eq "on", de("https"), de("http") ) & "://" & CGI.HTTP_HOST & getDirectoryFromPath( CGI.SCRIPT_NAME )#</cfoutput>" /> | ||
| <link rel="stylesheet" type="text/css" href="../css/fw1.css" /> | ||
| <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous"> | ||
| <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css" integrity="sha384-BY+fdrpOd3gfeRvTSMT+VUZmA728cfF9Z2G42xpaRkUGu2i3DyzpTURDo5A6CaLK" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/litera/bootstrap.min.css" integrity="sha384-enpDwFISL6M3ZGZ50Tjo8m65q06uLVnyvkFO3rsoW0UC15ATBFz3QEhr3hmxpYsn" crossorigin="anonymous"> | ||
| </head> | ||
| <body> | ||
| <div class="wrap"> | ||
| <div class="container-fluid"> | ||
| <div class="page"> | ||
| <img src="../css/fw1logo7.jpg"/> | ||
| <cfoutput>#body#</cfoutput> | ||
| <p><a href="<cfoutput>#buildURL( ':main.default' )#</cfoutput>">Examples Home</a></p> | ||
| </div> | ||
| <div class="footer"> | ||
| <div class="text-center"> | ||
| <a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-<cfoutput>#year( now() )#</cfoutput>, Sean Corfield, Marcin Szczepanski, Ryan Cogswell - | ||
| <a href="http://www.apache.org/licenses/LICENSE-2.0">Licensed under the Apache License, Version 2.0</a><br /> | ||
| You are running FW/1 version <cfoutput>#variables.framework.version#</cfoutput>. | ||
| You are running FW/1 version <cfoutput>#variables.framework.version# on #server.coldfusion.productname & " " & | ||
| ( structKeyExists( server, "lucee" ) ? | ||
| server.lucee.version & " / " : "" ) & | ||
| server.coldfusion.productversion#</cfoutput>. | ||
| </div> | ||
| </div> | ||
| <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,28 @@ | ||
| <html> | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <title>FW/1 - Framework One</title> | ||
| <base href="<cfoutput>#iif( CGI.HTTPS eq "on", de("https"), de("http") ) & "://" & CGI.HTTP_HOST & getDirectoryFromPath( CGI.SCRIPT_NAME )#</cfoutput>" /> | ||
| <link rel="stylesheet" type="text/css" href="css/fw1.css" /> | ||
| <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous"> | ||
| <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css" integrity="sha384-BY+fdrpOd3gfeRvTSMT+VUZmA728cfF9Z2G42xpaRkUGu2i3DyzpTURDo5A6CaLK" crossorigin="anonymous"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/litera/bootstrap.min.css" integrity="sha384-enpDwFISL6M3ZGZ50Tjo8m65q06uLVnyvkFO3rsoW0UC15ATBFz3QEhr3hmxpYsn" crossorigin="anonymous"> | ||
| </head> | ||
| <body> | ||
| <div class="wrap"> | ||
| <div class="container-fluid"> | ||
| <div class="page"> | ||
| <img src="css/fw1logo7.jpg"/> | ||
| <cfoutput>#body#</cfoutput> | ||
| </div> | ||
| <div class="footer"> | ||
| <div class="text-center"> | ||
| <a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-<cfoutput>#year( now() )#</cfoutput> Sean Corfield, Marcin Szczepanski, Ryan Cogswell - | ||
| <a href="http://www.apache.org/licenses/LICENSE-2.0">Licensed under the Apache License, Version 2.0</a><br /> | ||
| You are running FW/1 version <cfoutput>#variables.framework.version#</cfoutput>. | ||
| You are running FW/1 version <cfoutput>#variables.framework.version# on #server.coldfusion.productname & " " & | ||
| ( structKeyExists( server, "lucee" ) ? | ||
| server.lucee.version & " / " : "" ) & | ||
| server.coldfusion.productversion#</cfoutput>. | ||
| </div> | ||
| </div> | ||
| <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| <p>FW/1 - Framework One - leverages Application.cfc and some simple conventions to provide a 'full' MVC framework in a single file.</p> | ||
| <p>Intended to require near-zero configuration, FW/1 lets you build your application without worrying about a framework getting in your way.</p> | ||
| <p>Controllers, Services (the gateway to your application's model), Views and Layouts are all 'discovered' using straightforward conventions.</p> | ||
| <p>Your controller and service CFCs don't need to extend anything.</p> | ||
| <p>Your views and layouts don't need to know about objects and method calls (a simple 'request context' structure - rc - is available containing URL and form scope data as well as data setup and passed by the framework and controllers).</p> | ||
| <p>Supports your choice of bean factory (as long as it offers containsBean(name) and getBean(name) methods) and autowiring of controllers and services. Your controller and service CFC instances can be managed by your bean factory instead if you prefer, again following a simple naming convention!</p> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <p>FW/1 - Framework One - leverages Application.cfc and some simple conventions to provide a 'full' MVC framework in a single file.</p> | ||
| <p>Intended to require near-zero configuration, FW/1 lets you build your application without worrying about a framework getting in your way.</p> | ||
| <p>Controllers, Services (the gateway to your application's model), Views and Layouts are all 'discovered' using straightforward conventions.</p> | ||
| <p>Your controller and service CFCs don't need to extend anything.</p> | ||
| <p>Your views and layouts don't need to know about objects and method calls (a simple 'request context' structure - rc - is available containing URL and form scope data as well as data setup and passed by the framework and controllers).</p> | ||
| <p>Supports your choice of bean factory (as long as it offers containsBean(name) and getBean(name) methods) and autowiring of controllers and services. Your controller and service CFC instances can be managed by your bean factory instead if you prefer, again following a simple naming convention!</p> | ||
| </div> | ||
| </div> |