Revert "Finalize Copyright information" because merge is fucked.

This reverts commit 2c9ae443879a212d988a5034a07801060d283d59.

diff --git a/languages/ca.php b/languages/ca.php
index 10355fab1ecf85767d0b9150550cc89d8a332f3d..214d327aa295c7922485deed161170837e5c1dd4 100644 (file)
--- a/languages/ca.php
+++ b/languages/ca.php
@@ -7,23 +7,12 @@
  *\r
  * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>\r
  *\r
-<<<<<<< HEAD
  * This program is free software: you can redistribute it and/or\r
  * modify it under the terms of the GNU Affero General Public License\r
  * as published by the Free Software Foundation, either version 3 of\r
  * the License, or (at your option) any later version.\r
  *\r
  * This program is distributed in the hope that it will be useful, but\r
-=======
- * This file is part of the Colorbox plugin for Elgg.\r
- *\r
- * Colorbox is free software: you can redistribute it and/or modify it\r
- * under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * Colorbox is distributed in the hope that it will be useful, but\r
->>>>>>> cb063a6... Finalize Copyright information
  * WITHOUT ANY WARRANTY; without even the implied warranty of\r
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
  * Affero General Public License for more details.\r

diff --git a/languages/en.php b/languages/en.php
index 8b18532a6a83b3ac56341b1f4697aaa2c7016292..70bab4e0544f9050c2fd006bfa403adbdddcfe1f 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -7,23 +7,12 @@
  *\r
  * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>\r
  *\r
-<<<<<<< HEAD
  * This program is free software: you can redistribute it and/or\r
  * modify it under the terms of the GNU Affero General Public License\r
  * as published by the Free Software Foundation, either version 3 of\r
  * the License, or (at your option) any later version.\r
  *\r
  * This program is distributed in the hope that it will be useful, but\r
-=======
- * This file is part of the Colorbox plugin for Elgg.\r
- *\r
- * Colorbox is free software: you can redistribute it and/or modify it\r
- * under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * Colorbox is distributed in the hope that it will be useful, but\r
->>>>>>> cb063a6... Finalize Copyright information
  * WITHOUT ANY WARRANTY; without even the implied warranty of\r
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
  * Affero General Public License for more details.\r

diff --git a/languages/es.php b/languages/es.php
index 6855c93f29251b34dd64c88900f20b131fffa835..e49d0db47c1c2f737242aab8e7137b1b5dcd62b1 100644 (file)
--- a/languages/es.php
+++ b/languages/es.php
@@ -7,23 +7,12 @@
  *\r
  * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>\r
  *\r
-<<<<<<< HEAD
  * This program is free software: you can redistribute it and/or\r
  * modify it under the terms of the GNU Affero General Public License\r
  * as published by the Free Software Foundation, either version 3 of\r
  * the License, or (at your option) any later version.\r
  *\r
  * This program is distributed in the hope that it will be useful, but\r
-=======
- * This file is part of the Colorbox plugin for Elgg.\r
- *\r
- * Colorbox is free software: you can redistribute it and/or modify it\r
- * under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * Colorbox is distributed in the hope that it will be useful, but\r
->>>>>>> cb063a6... Finalize Copyright information
  * WITHOUT ANY WARRANTY; without even the implied warranty of\r
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
  * Affero General Public License for more details.\r

diff --git a/start.php b/start.php
index ec1c065bc2bfbc5519d099ef487ad605940da11d..b19b2efcf5b48d8b049316b22fa209637774d3c1 100644 (file)
--- a/start.php
+++ b/start.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Colorbox -- Add jQuery.lightbox support to Elgg
+ * Colorbox -- A lightweight, customizable lightbox plugin for jQuery
  *
  * @package        Lorea
  * @subpackage     Colorbox
@@ -23,10 +23,6 @@
  * You should have received a copy of the GNU Affero General Public
  * License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * The Colorbox plugin for Elgg contains the Colorbox jQuery plugin,
- * released under the MIT License, and Copyright 2011 Jack Moore.
- * See vendors/colorbox/
  */
 
 elgg_register_event_handler('init', 'system', 'colorbox_init');

diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php
index d590c506a73f48fff58f44a70ba1e6888afa86d8..e18c02bf8b0ec791c31e176ebd113a3713ecde78 100644 (file)
--- 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 7856b4b58a2cae96f5a7686dcf39ef7950e697c3..42165fa42aab9a1b8d645a3c51d7a4e88ea4a5d9 100644 (file)
--- 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 3e0f8912b1d212d2947f1eb7dbf6eff14c4b62b6..732092e2bc4f6a89d04a9e7a1b2227e8035cbbad 100644 (file)
--- 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);
  */
+
 ?>
 
 /**