Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[newui] Copyright and FOSSiness

  • Loading branch information...
commit a86d8109dcff5c0e82a58b77cd3ca90718cbcace 1 parent 163e4d1
@klange klange authored
Showing with 58 additions and 4 deletions.
  1. +32 −4 README
  2. +6 −0 index2.html
  3. +20 −0 www-data/acoustics2.css
View
36 README
@@ -45,11 +45,39 @@ You can also look for information at:
COPYRIGHT AND LICENCE
-Copyright (C) 2010 Adrian Kreher
+Copyright (c) 2009-2011 Association for Computing Machinery at University of
+Illinois at Urbana-Champaign. All rights reserved.
+
+Developed by: Association for Computing Machinery
+ University of Illinois at Urbana-Champaign
+ http://www.acm.uiuc.edu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal with the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimers.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimers in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the names of Association for Computing Machinery, University of
+ Illinois at Urbana-Champaign, nor the names of its contributors may be
+ used to endorse or promote products derived from this Software without
+ specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+WITH THE SOFTWARE.
+
+
-This program is free software; you can redistribute it and/or modify it
-under the terms of either: the GNU General Public License as published
-by the Free Software Foundation; or the Artistic License.
See http://dev.perl.org/licenses/ for more information.
View
6 index2.html
@@ -138,6 +138,12 @@
<img src="www-data/images/ui2/amp_logo_big.png" alt="Acoustics" /><br />
<span id="statistics-song-count" class="statistics-value">...</span> songs are available<br />
the top artist is <span id="statistics-top-artist" class="statistics-value">...</span><br />
+ <div id="statistics-about-container">
+ <div id="statistics-about">
+ Acoustics is free software under the <a href="https://github.com/avuserow/amp/raw/master/LICENSE">NCSA license</a>.<br />
+ <a href="http://github.com/avuserow/amp">Contribute</a>
+ </div>
+ </div>
</div>
<div id="statistics-statusbar" class="statusbar">
<div id="statistics-status">System Statistics</div>
View
20 www-data/acoustics2.css
@@ -313,6 +313,26 @@ a img {
.statistics-value {
font-weight: bold;
}
+ #statistics-about-container {
+ position: absolute;
+ bottom: 0px;
+ right: 0px;
+ left: 0px;
+ height: 50px;
+ }
+ #statistics-about {
+ box-shadow: 0px 0px 5px rgba(0,0,0,0.3);
+ background-color: rgba(0,0,0,0.3);
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ font-size: 12px;
+ width: 500px;
+ padding: 0px;
+ line-height: 20px;
+ margin-right: auto;
+ margin-left: auto;
+ }
#search-results {
position: absolute;

0 comments on commit a86d810

Please sign in to comment.
Something went wrong with that request. Please try again.