Commits

Clark C. Evans  committed 5591bdf

removing attribution of other projects (we will add them soon enough)
adding logo to about htsql dialog

  • Participants
  • Parent commits bd5c330

Comments (0)

Files changed (8)

File src/htsql/__init__.py

 There is NO WARRANTY, to the extent permitted by law.  This software
 is released under the AGPLv3 as well as a permissive license for use
 with open source databases.  See http://htsql.org/license/
+
+The HTSQL language and implementation was developed by members 
+of the HTSQL Project (http://htsql.org).
 """
-__credits__ = [
-"This work is developed by the HTSQL Project (http://htsql.org)",
-"This work incorporates Python Programming Language (http://python.org)",
-"This work incorporates SQLite Relational Database (http://sqlite.org)",
-"This work incorporates PyYAML Processor (http://pyyaml.org)"
-]
 
 from .core.application import Application as HTSQL
 

File src/htsql/ctl/__init__.py

         import htsql
         return trim_doc(htsql.__license__)
 
-    def get_credits(self):
-        import htsql
-        return [trim_doc(credit) for credit in htsql.__credits__]
-
     def get_appropriate_legal_notices(self):
         notices = []
         version = self.get_version()
         license = self.get_license()
         if license is not None:
             notices.append(license)
-        credits = self.get_credits()
-        if credits:
-            notices.append("\nAttributions\n------------")
-        for credit in credits:
-            notices.append(credit)
         return "\n".join(notices)
 
 def main():

File src/htsql/tweak/shell/static/htsql_125x50.png

Added
New image

File src/htsql/tweak/shell/static/htsql_88x31.png

Added
New image

File src/htsql/tweak/shell/static/index.html

 There is NO WARRANTY, to the extent permitted by law.  This software
 is released under the AGPLv3 as well as a permissive license for use
 with open source databases.  See http://htsql.org/license/
-
-Attributions
-------------
-This work is developed by the HTSQL Project (http://htsql.org)
-This work incorporates Python Programming Language (http://python.org)
-This work incorporates SQLite Relational Database (http://sqlite.org)
-This work incorporates PyYAML Processor (http://pyyaml.org)
           </pre>
+          <a href="http://htsql.org"><img src="htsql_88x31.png"/></a>
         </div>
       </div>
     </div>

File src/htsql/tweak/shell/static/shell.css

    padding-left: 20px;
    font-size: 80%
 }
+
+#help-popup img {
+   float: right;
+   position: relative;
+   right: 0;
+   bottom: 0;
+}

File src/htsql_pgsql/__init__.py

 #
 # Copyright (c) 2006-2012, Prometheus Research, LLC
 #
-
-import htsql
-__credit = "This work incorporates PostgreSQL Database (http://postgresql.org)"
-if __credit not in htsql.__credits__:
-    htsql.__credits__.append(__credit)
-

File test/output/routine.yaml

 
   exit: 0
 - ctl: [--version]
-  stdout: |+
-    HTSQL 2.3.0
-    Copyright (c) 2006-2012, Prometheus Research, LLC
-    This is free software: you are free to change and redistribute it.
-    There is NO WARRANTY, to the extent permitted by law.  This software
-    is released under the AGPLv3 as well as a permissive license for use
-    with open source databases.  See http://htsql.org/license/
-
-    Attributions
-    ------------
-    This work is developed by the HTSQL Project (http://htsql.org)
-    This work incorporates Python Programming Language (http://python.org)
-    This work incorporates SQLite Relational Database (http://sqlite.org)
-    This work incorporates PyYAML Processor (http://pyyaml.org)
-
+  stdout: "HTSQL 2.3.0\nCopyright (c) 2006-2012, Prometheus Research, LLC\nThis is
+    free software: you are free to change and redistribute it.\nThere is NO WARRANTY,
+    to the extent permitted by law.  This software\nis released under the AGPLv3 as
+    well as a permissive license for use\nwith open source databases.  See http://htsql.org/license/\n\nThe
+    HTSQL language and implementation was developed by members \nof the HTSQL Project
+    (http://htsql.org).\n\n"
   exit: 0
 - ctl: [help]
   stdout: |+
 
   exit: 0
 - ctl: [version]
-  stdout: |+
-    HTSQL 2.3.0
-    Copyright (c) 2006-2012, Prometheus Research, LLC
-    This is free software: you are free to change and redistribute it.
-    There is NO WARRANTY, to the extent permitted by law.  This software
-    is released under the AGPLv3 as well as a permissive license for use
-    with open source databases.  See http://htsql.org/license/
-
-    Attributions
-    ------------
-    This work is developed by the HTSQL Project (http://htsql.org)
-    This work incorporates Python Programming Language (http://python.org)
-    This work incorporates SQLite Relational Database (http://sqlite.org)
-    This work incorporates PyYAML Processor (http://pyyaml.org)
-
+  stdout: "HTSQL 2.3.0\nCopyright (c) 2006-2012, Prometheus Research, LLC\nThis is
+    free software: you are free to change and redistribute it.\nThere is NO WARRANTY,
+    to the extent permitted by law.  This software\nis released under the AGPLv3 as
+    well as a permissive license for use\nwith open source databases.  See http://htsql.org/license/\n\nThe
+    HTSQL language and implementation was developed by members \nof the HTSQL Project
+    (http://htsql.org).\n\n"
   exit: 0