aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-30 12:42:51 +0100
committerSem <sembrestels@riseup.net>2012-11-30 12:42:51 +0100
commit36520e367d2d05b6e4c1f3d6703ea395c303d77b (patch)
treeccd50c74e771fa6a586f313050420285173a425b /views
parent2c9ae443879a212d988a5034a07801060d283d59 (diff)
downloadelgg-36520e367d2d05b6e4c1f3d6703ea395c303d77b.tar.gz
elgg-36520e367d2d05b6e4c1f3d6703ea395c303d77b.tar.bz2
Revert "Finalize Copyright information" because merge is fucked.
This reverts commit 2c9ae443879a212d988a5034a07801060d283d59.
Diffstat (limited to 'views')
-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, 21 insertions, 24 deletions
diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php
index d590c506a..e18c02bf8 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 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 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
+ * This program 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 7856b4b58..42165fa42 100644
--- a/views/default/js/embed/embed.php
+++ b/views/default/js/embed/embed.php
@@ -1,6 +1,6 @@
<?php
/**
- * Colorbox -- Elgg Embed Javascript
+ * Colorbox -- Javascript
*
* Used as a view because we need to pass a full URL to AlphaImageLoader.
*
@@ -9,14 +9,12 @@
*
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
- * This file is part of the Colorbox plugin for Elgg.
+ * 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.
*
- * 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
+ * This program 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.
@@ -35,7 +33,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 3e0f8912b..732092e2b 100644
--- a/views/default/js/lightbox.php
+++ b/views/default/js/lightbox.php
@@ -1,6 +1,6 @@
<?php
/**
- * Colorbox -- Javascript
+ * Colorbox -- Stylesheet
*
* Used as a view because we need to pass a full URL to AlphaImageLoader.
*
@@ -9,14 +9,12 @@
*
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
- * This file is part of the Colorbox plugin for Elgg.
+ * 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.
*
- * 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
+ * This program 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.
@@ -38,6 +36,7 @@
*
* @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options);
*/
+
?>
/**