Permalink
Browse files

Update

Add proper license files.
Added some more infrastructure code.
Update bootstrap to 2.1.1
  • Loading branch information...
1 parent f5d5afc commit 6e173a8c62f3ecdba4bc1fc802ae5716694640ad @a-fung committed Sep 7, 2012
Showing with 1,164 additions and 30 deletions.
  1. +1 −0 .gitignore
  2. +180 −1 LICENSE
  3. +62 −0 NOTICE
  4. BIN external_libraries/MySql.Data.dll
  5. +16 −3 gather_aspnet.ps1
  6. +16 −3 gather_php.ps1
  7. +6 −4 source/aspnetserver/admin.html
  8. +11 −0 source/aspnetserver/afung.MangaWeb3.Server.csproj
  9. +2 −2 source/aspnetserver/css/bootstrap-responsive.min.css
  10. +2 −2 source/aspnetserver/css/bootstrap.min.css
  11. +1 −1 source/aspnetserver/css/mangaweb.css
  12. BIN source/aspnetserver/img/loading.gif
  13. +6 −3 source/aspnetserver/index.html
  14. +7 −4 source/aspnetserver/install.html
  15. +22 −0 source/aspnetserver/js/afung.MangaWeb3.Client.Install.debug.js
  16. +3 −1 source/aspnetserver/js/afung.MangaWeb3.Client.Install.js
  17. +270 −0 source/aspnetserver/js/afung.MangaWeb3.Client.debug.js
  18. +26 −2 source/aspnetserver/js/afung.MangaWeb3.Client.js
  19. +1 −1 source/aspnetserver/js/bootstrap.min.js
  20. +44 −0 source/aspnetserver/lang/en-us.html
  21. +2 −0 source/aspnetserver/lang/zh-hk.html
  22. 0 source/aspnetserver/template/client.html
  23. +1 −0 source/aspnetserverinstall/InstallAjax.aspx
  24. +17 −0 source/aspnetserverinstall/InstallAjax.aspx.cs
  25. +15 −0 source/aspnetserverinstall/InstallAjax.aspx.designer.cs
  26. +8 −0 source/aspnetserverinstall/afung.MangaWeb3.Server.Install.csproj
  27. +1 −1 source/haxe/afung/mangaWeb3/server/ServerAjax.hx
  28. +24 −2 source/less/mangaweb.less
  29. +96 −0 source/scriptsharp/Application.cs
  30. +17 −0 source/scriptsharp/Environment.cs
  31. +39 −0 source/scriptsharp/HtmlConstants.cs
  32. +129 −0 source/scriptsharp/Strings.cs
  33. +94 −0 source/scriptsharp/Template.cs
  34. +11 −0 source/scriptsharp/afung.MangaWeb3.Client.csproj
  35. +33 −0 source/scriptsharpinstall/InstallApp.cs
  36. +1 −0 source/scriptsharpinstall/afung.MangaWeb3.Client.Install.csproj
View
@@ -167,3 +167,4 @@ pip-log.txt
scriptbin/
haxephp/
output/
+copy*test.ps1
View
181 LICENSE
@@ -1 +1,180 @@
-TBD
+ MangaWeb3 Project
+ Copyright 2012 Man Kwan Liu
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
View
62 NOTICE
@@ -0,0 +1,62 @@
+MangaWeb3 Project
+Copyright 2012 Man Kwan Liu
+
+MangaWeb3 is licensed under the Apache License v2.0 (see LICENSE file).
+MangaWeb3 also includes works distributed under the licenses listed below.
+
+Bootstrap
+--------------
+Website: http://twitter.github.com/bootstrap/
+Copyright: Copyright 2012 Twitter, Inc.
+License: The Apache License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0
+
+
+GLYPHICONS FREE
+--------------
+Website: http://glyphicons.com/
+Copyright: © 2010 - 2012 Jan Kovařík
+License: The Creative Commons Attribution 3.0 Unported (CC BY 3.0)
+ http://creativecommons.org/licenses/by/3.0/deed.en
+
+
+The Haxe libraries
+--------------
+Website: http://haxe.org/
+Copyright: Copyright (c) 2005, the Haxe Project Contributors
+License: The Haxe libraries license
+ http://haxe.org/doc/license
+
+
+jQuery
+--------------
+Website: http://jquery.com/
+Copyright: © 2012 The jQuery Foundation
+License: The MIT License
+ https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
+
+
+Json.NET
+--------------
+Website: http://json.codeplex.com/
+Copyright: Copyright (c) 2007 James Newton-King
+License: The MIT License (MIT)
+ http://json.codeplex.com/license
+
+
+MySQL
+--------------
+Website: http://www.mysql.com
+Copyright: © 2012, Oracle Corporation and/or its affiliates
+License: The GPL License
+ http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+
+
+SevenZipSharp
+--------------
+Website: http://sevenzipsharp.codeplex.com
+Copyright: Copyright (C) Markovtsev Vadim 2009, 2010
+License: The GNU Library General Public License (LGPL)
+ http://sevenzipsharp.codeplex.com/license
+
+
Binary file not shown.
View
@@ -8,14 +8,17 @@ if (!$dir.Exists) { $dir.Create(); }
$path = $(get-location).ToString() + "\output\aspnet";
$dir = new-object "System.IO.DirectoryInfo" -argumentlist $path;
if ($dir.Exists) {
- $dir.Delete($true);
+ Remove-Item $path\* -recurse;
Start-Sleep -s 1;
}
-$dir.Create();
+else {
+ $dir.Create();
+}
# copy files
copy LICENSE $path
+copy NOTICE $path
# HTML files
@@ -42,7 +45,7 @@ copy source\aspnetserver\js\servertype.js $path\js
# debug js files
-if ($false) {
+if ($true) {
copy source\aspnetserver\js\afung.MangaWeb3.Client.Admin.debug.js $path\js
copy source\aspnetserver\js\afung.MangaWeb3.Client.Install.debug.js $path\js
copy source\aspnetserver\js\afung.MangaWeb3.Client.debug.js $path\js
@@ -56,6 +59,16 @@ mkdir $path\img
copy source\aspnetserver\img\*.* $path\img
+# lang files
+mkdir $path\lang
+copy source\aspnetserver\lang\*.* $path\lang
+
+
+# template files
+mkdir $path\template
+copy source\aspnetserver\template\*.* $path\template
+
+
# aspx files
copy source\aspnetserver\*.aspx $path
copy source\aspnetserverinstall\*.aspx $path
View
@@ -8,14 +8,17 @@ if (!$dir.Exists) { $dir.Create(); }
$path = $(get-location).ToString() + "\output\php";
$dir = new-object "System.IO.DirectoryInfo" -argumentlist $path;
if ($dir.Exists) {
- $dir.Delete($true);
+ Remove-Item $path\* -recurse;
Start-Sleep -s 1;
}
-$dir.Create();
+else {
+ $dir.Create();
+}
# copy files
copy LICENSE $path
+copy NOTICE $path
# HTML files
@@ -42,7 +45,7 @@ copy source\php\js\servertype.js $path\js
# debug js files
-if ($false) {
+if ($true) {
copy source\aspnetserver\js\afung.MangaWeb3.Client.Admin.debug.js $path\js
copy source\aspnetserver\js\afung.MangaWeb3.Client.Install.debug.js $path\js
copy source\aspnetserver\js\afung.MangaWeb3.Client.debug.js $path\js
@@ -56,6 +59,16 @@ mkdir $path\img
copy source\aspnetserver\img\*.* $path\img
+# lang files
+mkdir $path\lang
+copy source\aspnetserver\lang\*.* $path\lang
+
+
+# template files
+mkdir $path\template
+copy source\aspnetserver\template\*.* $path\template
+
+
# php files
robocopy source\php $path /E
@@ -1,16 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=0" />
<title>MangaWeb - Admin</title>
<link href="css/bootstrap.min.css" rel="stylesheet" />
<link href="css/bootstrap-responsive.min.css" rel="stylesheet" />
<link href="css/mangaweb.css" rel="stylesheet" />
<script type="text/javascript" src="js/jquery-1.8.1.min.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
- <script type="text/javascript" src="js/mscorlib.js"></script>
- <script type="text/javascript" src="js/afung.MangaWeb3.Common.js"></script>
- <script type="text/javascript" src="js/afung.MangaWeb3.Client.js"></script>
- <script type="text/javascript" src="js/afung.MangaWeb3.Client.Admin.js"></script>
+ <script type="text/javascript" src="js/mscorlib.debug.js"></script>
+ <script type="text/javascript" src="js/afung.MangaWeb3.Common.debug.js"></script>
+ <script type="text/javascript" src="js/afung.MangaWeb3.Client.debug.js"></script>
+ <script type="text/javascript" src="js/afung.MangaWeb3.Client.Admin.debug.js"></script>
<script type="text/javascript" src="js/servertype.js"></script>
</head>
<body>
@@ -33,6 +33,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="MySql.Data, Version=6.5.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\external_libraries\MySql.Data.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\external_libraries\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -76,6 +81,9 @@
<Content Include="js\jquery-1.8.1.min.js" />
<Content Include="js\mscorlib.debug.js" />
<Content Include="js\mscorlib.js" />
+ <Content Include="js\servertype.js" />
+ <Content Include="lang\en-us.html" />
+ <Content Include="lang\zh-hk.html" />
<Content Include="ServerAjax.aspx" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config">
@@ -101,6 +109,9 @@
<Name>afung.MangaWeb3.Common</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="template\" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
Oops, something went wrong.

0 comments on commit 6e173a8

Please sign in to comment.