Skip to content

Commit

Permalink
- License change to creative commons. Part 1
Browse files Browse the repository at this point in the history
- Readme, install, and upgrade header bar logo change
- Troubleshooter popover effect fix

git-svn-id: https://pligg.svn.beanstalkapp.com/svnroot/trunk@385 68377534-e894-4f14-aad3-e92cf46e58fa
  • Loading branch information
yankidank committed Aug 29, 2012
1 parent f0eb2e0 commit 12dc8da
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 91 deletions.
120 changes: 45 additions & 75 deletions LICENSE.txt

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions install/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div id="footer">
<span class="subtext">
<a href="http://pligg.com/" target="_blank">Pligg Content Management System</a>
| Need Web Hosting? Check out our <a href="http://pligg.com/hosting/" target="_blank">Preferred Hosts</a>
| Need Web Hosting? Check out our <a href="http://pligg.com/hosting/" target="_blank">Preferred Web Hosts</a>
</span>
</div>
</footer>
Expand All @@ -24,5 +24,4 @@
<script type="text/javascript" src="../templates/admin/js/bootstrap.js"></script>

</body>
</html>

</html>
3 changes: 3 additions & 0 deletions install/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
.navbar .nav > li > a {
padding-top:11px;
}
.popover {
width:500px;
}
</style>

<title>Pligg CMS <?php $lang['installer'] ?></title>
Expand Down
2 changes: 1 addition & 1 deletion install/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="http://pligg.com/"><img src="../templates/admin/img/pligg.png" height="20px;" alt="Pligg CMS" title="Pligg CMS"/></a>
<a class="brand" href="http://pligg.com/"><img src="../templates/admin/img/pligg_color.png" height="20px;" alt="Pligg CMS" title="Pligg CMS"/></a>
<div class="nav-collapse">
<ul class="nav">
<li><a href="../" title="<?php echo $lang['Home'] ?>"><?php echo $lang['Home'] ?></a></li>
Expand Down
22 changes: 10 additions & 12 deletions readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="http://pligg.com/"><img src="./templates/admin/img/pligg.png" height="20px;" alt="Pligg CMS" title="Pligg CMS"/></a>
<a class="brand" href="http://pligg.com/"><img src="./templates/admin/img/pligg_color.png" height="20px;" alt="Pligg CMS" title="Pligg CMS"/></a>
<div class="nav-collapse">
<ul class="nav">
<li><a href="./index.php" title="Home">Home</a></li>
Expand Down Expand Up @@ -126,7 +126,7 @@
<li>Log into your site as admin</li>
<li>Click on admin panel link</li>
<li>Click on File and MySQL backup link</li>
<li>Backup your files (and avatars) and your database</li>
<li>Backup your files, avatars, and MySQL database</li>
<li>Download the backup .zip files to your computer</li>
<li>Delete the files from the backup manager</li>
</ol>
Expand All @@ -147,11 +147,11 @@
You will need to re-enable them after upgrade.</li>
<li>Delete all of the files from your server EXCEPT:
<ol>
<li>/avatars/ (entire directory)</li>
<li>/libs/dbconnect.php</li>
<li>/.htaccess</li>
<li>/favicon.ico</li>
<li>/settings.php</li>
<li>/avatars/ (entire directory)</li>
<li>/libs/dbconnect.php</li>
<li>/.htaccess</li>
<li>/favicon.ico</li>
<li>/settings.php</li>
</ol>
</li>
<li>Upload all of the new files to your server. <br />
Expand All @@ -170,20 +170,18 @@
</ul>
</li>
<li>Run the upgrade from /install/upgrade.php<br />
If there are no error messages, delete the /install directory from your web server.</li>
If there are no error messages, delete the /install directory from your web server.</li>
<li>Log in as an "admin" level user.<br />
In some cases you may already be logged in from your previous version of Pligg.</li>
In some cases you may already be logged in from your previous version of Pligg.</li>
<li>Either update your template to work with the latest version or navigate to /admin/admin_config.php?page=Template and change the template name to "wistie"</li>
<li>Re-activate the disabled modules from step 4, navigate to /admin/admin_modules.php</li>
</ol>
<br />


<legend><a href="#support" name="support">Support</a></legend>
<p>Pligg is an Open source project, but that doesn't stop us from having a rock-solid support team. Pliggers from all across the world are watching the forum 24 hours a day helping each other out. If you have any questions, ideas, modifications or bugs to discuss please let us know through the Pligg forum.</p>
<p>Creating a forum account is also important because it allows you to download additional free templates and modules from Pligg.com. Not only can you download free files, but you can keep track of updates for your modules and templates by marking them as "installed". You will then be notified automatically when a developer updates any of your installed files.</p>


<legend><a href="#credits" name="credits">Credits</a></legend>
<p>This code was originally written by Ricardo Galli for the open source project known as <a href="http://www.meneame.net">Meneame</a>.</p>
<p>Many thanks to those who donated time and money to the Pligg project. Without their support we wouldn't be able to keep this project going. If you are interested in becoming a part of the development team please <a href="http://forums.pligg.com/sendmessage.php?do=mailmember&u=2">contact "Yankidank" through the forum</a>.</p>
Expand All @@ -198,7 +196,7 @@
<p><strong>A special thank you to all of the Pligg developers and translators.</strong></p>

<legend><a href="#license" name="license">License</a></legend>
<p>Pligg's source code is published under the <a href="http://www.affero.org/oagpl.html">Affero General Public License</a>. You can view the license in the file LICENSE.txt and in the default "About" page that is included when you install Pligg.</p>
<p>Pligg's source code is published under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported Copyright</a>. You can view the license in the file LICENSE.txt.</p>


<legend>Questions / Comments?</legend>
Expand Down
Binary file added templates/admin/img/pligg_color.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 12dc8da

Please sign in to comment.