aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorhellekin <hellekin@cepheide.org>2012-11-08 22:34:11 -0300
committerhellekin <hellekin@cepheide.org>2012-11-08 23:40:54 -0300
commit2c9ae443879a212d988a5034a07801060d283d59 (patch)
tree9c9371630815558485d6d0f8e744f32b44e24b6d /views/default
parent58fd3ce5bbac21dc1ce4b583f781eb804bb28eb2 (diff)
downloadelgg-2c9ae443879a212d988a5034a07801060d283d59.tar.gz
elgg-2c9ae443879a212d988a5034a07801060d283d59.tar.bz2
Finalize Copyright information
Conflicts: languages/ca.php languages/en.php languages/es.php start.php views/default/css/lightbox.php views/default/js/embed/embed.php views/default/js/lightbox.php
Diffstat (limited to 'views/default')
-rw-r--r--views/default/css/lightbox.php14
-rw-r--r--views/default/js/embed/embed.php16
-rw-r--r--views/default/js/lightbox.php15
3 files changed, 24 insertions, 21 deletions
diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php
index e18c02bf8..d590c506a 100644
--- a/views/default/css/lightbox.php
+++ b/views/default/css/lightbox.php
@@ -2,19 +2,19 @@
/**
* Colorbox -- Stylesheet
*
- * Used as a view because we need to pass a full URL to AlphaImageLoader.
- *
* @package Lorea
* @subpackage Colorbox
*
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
+ * This file is part of the Colorbox plugin for Elgg.
+ *
+ * Colorbox is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
+ * Colorbox is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.
diff --git a/views/default/js/embed/embed.php b/views/default/js/embed/embed.php
index 42165fa42..7856b4b58 100644
--- a/views/default/js/embed/embed.php
+++ b/views/default/js/embed/embed.php
@@ -1,6 +1,6 @@
<?php
/**
- * Colorbox -- Javascript
+ * Colorbox -- Elgg Embed Javascript
*
* Used as a view because we need to pass a full URL to AlphaImageLoader.
*
@@ -9,12 +9,14 @@
*
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
+ * This file is part of the Colorbox plugin for Elgg.
*
- * This program is distributed in the hope that it will be useful, but
+ * Colorbox is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Colorbox is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.
@@ -33,7 +35,7 @@ elgg.embed.init = function() {
// caches the current textarea id
$(".embed-control").live('click', function() {
- var textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[0];
+ var textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[0];
elgg.embed.textAreaId = textAreaId.substr("embed-control-".length);
});
diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php
index 732092e2b..3e0f8912b 100644
--- a/views/default/js/lightbox.php
+++ b/views/default/js/lightbox.php
@@ -1,6 +1,6 @@
<?php
/**
- * Colorbox -- Stylesheet
+ * Colorbox -- Javascript
*
* Used as a view because we need to pass a full URL to AlphaImageLoader.
*
@@ -9,12 +9,14 @@
*
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
+ * This file is part of the Colorbox plugin for Elgg.
*
- * This program is distributed in the hope that it will be useful, but
+ * Colorbox is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Colorbox is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.
@@ -36,7 +38,6 @@
*
* @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options);
*/
-
?>
/**