Commit Graph

698 Commits

Author SHA1 Message Date
Bharat Mediratta
3d2fc86604 Permission only function on albums. 2008-12-16 00:30:05 +00:00
Tim Almdal
92e6ed8a8a Start of the dialog to specify the watermark placement. For convience, using the imagemagik nomicalture regarding watermark locations (east, west, center, etc.)
You can drag the watermark around but it doesn't stay in place.
Need to figure out how to resize the dialog box

and all of the supporting javascript
2008-12-15 23:08:18 +00:00
Bharat Mediratta
2f8b4df0f5 Protect menus and blocks against the fact that we don't have an item
on tag pages.
2008-12-15 21:23:00 +00:00
Bharat Mediratta
743ffe96ed Refresh from Kohana r3778.
Resolved tickets:
   http://dev.kohanaphp.com/ticket/967
2008-12-15 21:18:38 +00:00
Bharat Mediratta
b6363bcb03 Update to reflect changes in Kohana ORM relationship code.
Now you must call ORM::save() after ORM::add() and ORM::remove().
2008-12-15 20:49:05 +00:00
Tim Almdal
1d3e1484a7 The admin high level menu is shown if the active user is not a guest. Other sub menus depend on the appropriate level of access 2008-12-15 19:51:49 +00:00
Bharat Mediratta
b9c45407ec Reapply r18995: disable static table caches when we're in TEST_MODE. 2008-12-15 10:10:59 +00:00
Bharat Mediratta
3ae6ae53e6 (merge of vendor/kohana/modified/modules/unit_test r19226) Re-add english versions of unit test messages 2008-12-15 10:09:42 +00:00
Bharat Mediratta
8023325429 Fix Database::instance()->list_tables()
Upstream ticket:
  http://dev.kohanaphp.com/ticket/967
2008-12-15 10:05:00 +00:00
Bharat Mediratta
3131662c19 Reapply r19116:
Add support for filtering tests down to the Class::method level.

Upstream ticket:
  http://dev.kohanaphp.com/ticket/961
2008-12-15 09:51:48 +00:00
Bharat Mediratta
b5e6f79f5f Reapply patch to make tests always call teardown.
Upstream ticket:
  http://dev.kohanaphp.com/ticket/960
2008-12-15 09:45:55 +00:00
Bharat Mediratta
7b5713d485 (merge of vendor/kohana/modified r19221) Remove captcha, swift and pagination message catalogs; we don't need those 2008-12-15 09:34:54 +00:00
Bharat Mediratta
0567334c62 (merge of vendor/kohana/modified r19219) Add back in English localization strings, else we're missing a lot of critical strings at development time 2008-12-15 09:31:55 +00:00
Bharat Mediratta
93977e579c Refresh of Forge r168 from vendor/forge/modified 2008-12-15 09:22:32 +00:00
Bharat Mediratta
4fe895a2c4 Delete forge in preparation to refresh it from vendors/forge/modified 2008-12-15 09:21:44 +00:00
Bharat Mediratta
3b35e8b91c Refresh kohana from upstream svn trunk r3771.
During this process, remove a considerable number of files from kohana
that we will not be needing in Gallery3, including the following files
and directories:
    kohana/application
    kohana/example.htaccess
    kohana/index.php
    kohana/install.php
    kohana/kohana.png
    kohana/modules/archive
    kohana/modules/auth
    kohana/modules/flot
    kohana/modules/gmaps
    kohana/modules/kodoc
    kohana/modules/payment
    kohana/modules/smarty
    kohana/modules/unit_test/i18n
    kohana/modules/unit_test/tests/Example_Test.php
    kohana/modules/unit_test/tests/Valid_Test.php
    kohana/system/config/captcha.php
    kohana/system/controllers/captcha.php
    kohana/system/fonts
    kohana/system/i18n
    kohana/system/libraries/Calendar.php
    kohana/system/libraries/Calendar_Event.php
    kohana/system/libraries/Captcha.php
    kohana/system/libraries/Tagcloud.php
    kohana/system/vendor
    kohana/system/views/pagination
    kohana/system/views/kohana_calendar.php
2008-12-15 08:56:18 +00:00
Bharat Mediratta
628058b4ed Refresh from kohana svn trunk r3771 2008-12-15 08:52:32 +00:00
Bharat Mediratta
31759cb3b3 Delete trunk/kohana and trunk/modules/unit_test in preparation to refresh
them properly from the vendor branch.
2008-12-15 08:37:09 +00:00
Bharat Mediratta
e73bd90285 Convert tabs to spaces 2008-12-15 08:35:46 +00:00
Bharat Mediratta
011fe8bc93 Get rid of windows line endings 2008-12-15 08:35:30 +00:00
Chad Kieffer
cf47b3d45c Fix that rascal IE. Added conditional HTML comment to use fix-ie.css for IE7 and earlier. Fixed bg images in album/item view buttons, IE 6/7 don't appear to handle background-position: center center :( 2008-12-15 07:08:13 +00:00
Tim Almdal
20d5f45218 Fix the reference to jquery-ui.packed.js 2008-12-15 06:37:56 +00:00
Chad Kieffer
c68a0823b9 Should be ul, not u#gLoginLink 2008-12-15 06:17:17 +00:00
Chad Kieffer
1a5da095ae Renamed vars used in dialog init to avoid confusion and conflicts. 2008-12-15 06:11:32 +00:00
Tim Almdal
bc40b48729 revert the creation of a global gallery3 javascript variable 2008-12-15 05:08:22 +00:00
Tim Almdal
30c6ba48ea Forgot the quotes 2008-12-15 04:55:09 +00:00
Tim Almdal
e665a21038 Set up a global gallery3 javascript variable where we can put things that need to be passed into the javascript 2008-12-15 04:53:16 +00:00
Tim Almdal
1cb0268589 Change the label on the watermark form upload element, so the error message is at least somewhat meaningful 2008-12-15 04:40:09 +00:00
Tim Almdal
15c22471cc Cleanup watermark.js 2008-12-15 04:23:57 +00:00
Bharat Mediratta
96d906c903 Update Forge to r168 from upstream.
Resolves these issues:
  http://code.google.com/p/kohanamodules/issues/detail?id=6
  http://code.google.com/p/kohanamodules/issues/detail?id=7
2008-12-15 03:59:03 +00:00
Tim Almdal
b2107c3734 1) Move the deletion of the vars into module::delete helper
2) remove the watermark_add_form.html.php
2008-12-15 03:49:48 +00:00
Chad Kieffer
119344d9db Switched login display from display in the header to a dialog. Validation errors don't display on first failed attempt, will fix later. Moved jquery js, images, css out to respective folders. 2008-12-15 02:45:50 +00:00
Felix Rabinovich
a91492bc29 added missing png file to admin theme 2008-12-15 02:42:30 +00:00
Tim Almdal
e66a31bf45 Change the login form so that the legend is populated 2008-12-15 02:40:17 +00:00
Jakob Hilden
f9906978bf added move handle icon to the sidebar blocks 2008-12-15 02:26:59 +00:00
Bharat Mediratta
2812f34732 Rename default_admin to admin_default. 2008-12-15 01:55:07 +00:00
Bharat Mediratta
2842a1a8be Argh, fix a bad rename. 2008-12-15 01:52:04 +00:00
Bharat Mediratta
1127257f63 Rename default_admin to admin_default. 2008-12-15 01:50:52 +00:00
Bharat Mediratta
20f6be62c8 Add Admin_View 2008-12-15 01:49:25 +00:00
Bharat Mediratta
ac8bb530c2 Add proper preamble 2008-12-15 01:49:15 +00:00
Bharat Mediratta
c02d2554cf Refactor admin dashboard.
o Copy all the assets from default to default_admin so that they're
  totally separate
o Get rid of $item_theme
o Rename list_users.html.php to users.html.php
o use __call in admin controller to allow us to load any admin page
2008-12-15 01:48:34 +00:00
Bharat Mediratta
19e75b1e2e mark unauthorized exception w/ a @todo 2008-12-15 00:37:31 +00:00
Tim Almdal
db7e60da32 Change the watermark module to use forge.
Also the watermark file is now stored in varpath.
and the location is stored in the module vars table
2008-12-14 23:53:30 +00:00
Felix Rabinovich
c46bd97407 load admin subpages AJAXy way 2008-12-14 21:50:10 +00:00
Bharat Mediratta
b7487e384d convert single quotes to double quotes for consistency. 2008-12-14 21:39:56 +00:00
Tim Almdal
4b4e9e8e45 The start of the watermark module. It doesn't save the watermark at this point. This is more of trying out the approach where Forge is not used for forms. Basic html and the Validation library. 2008-12-14 19:43:04 +00:00
Felix Rabinovich
7fa014ae61 refactored admin views and added 'List User' 2008-12-14 07:59:24 +00:00
Felix Rabinovich
8b81731846 clean the links and require authorization before showing admin pages 2008-12-14 04:39:22 +00:00
Felix Rabinovich
cb92d1a70d 1. fix up the <link> and <script> elements in the dashboard <head>.
2. made the images work properly
2008-12-14 04:16:38 +00:00
Tim Almdal
1c279887aa Should be get_var not set_var 2008-12-14 03:48:32 +00:00