Bharat Mediratta
1b12d8467e
Roll the administration controller and view into an event listener in
...
three_nids_event so that we piggyback on the form generated in Admin >
Appearance > Theme Options. This makes a cleaner user interface for
the user since there's not an extra config page for the theme and
greatly reduces the amount of code in the theme.
2009-11-29 12:41:18 -08:00
Bharat Mediratta
649b7ba7bc
Get rid of the installer code, we don't actually need it yet since
...
there's no need to do any special work when we upgrade.
Change the theme code to only print out the JS if we have a web
property ID.
2009-11-29 11:49:39 -08:00
Romain LE DISEZ
9441bc08bb
Merge commit 'upstream/master'
2009-11-29 20:48:54 +01:00
Matt Rude
29893cf79b
Corrected version number from 1.2 to 2 since 1.2 is an invaild
...
version number.
2009-11-30 03:47:50 +08:00
Chad Kieffer
cb9482299f
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-29 09:29:24 -07:00
Bharat Mediratta
bc1f03996a
Tighten up the text a bit.
2009-11-29 00:08:00 -08:00
Bharat Mediratta
e12cc3dd2f
Move admin related controllers, views and helpers into the admin
...
subdirectory so that they're accessible in admin mode.
2009-11-28 23:30:33 -08:00
Bharat Mediratta
78e6c5434e
Move the 3nids admin menu option into the appearance menu.
2009-11-28 15:20:10 -08:00
Romain LE DISEZ
159fa9c815
Merge commit 'upstream/master'
2009-11-28 15:03:58 +01:00
Bharat Mediratta
b5414d7aa5
Rename and fix up some indentation.
2009-11-27 16:59:11 -08:00
Bharat Mediratta
2080cc531e
Roll comment functionality into the three_nids controllers and
...
helpers.
2009-11-27 16:56:37 -08:00
Bharat Mediratta
fbe35b1658
Fix indentation.
2009-11-27 16:33:33 -08:00
Bharat Mediratta
bed8f84566
Whitespace.
2009-11-27 16:31:15 -08:00
Bharat Mediratta
d6456b7643
Change references of theme_three_nids to three_nids
2009-11-27 16:27:33 -08:00
Bharat Mediratta
4e9c467a10
Rename 3nids to three_nids so that we can use the theme name as an
...
identifier in PHP. PHP identifiers are not allowed to start with a
digit (sigh).
2009-11-27 16:21:55 -08:00
Bharat Mediratta
bbd14d449d
Subsume movie_3nids controller into the standard movies controller,
...
and have page.html.php just render the movie content directly instead
of wrapping it in the page chrome.
2009-11-27 16:12:59 -08:00
Bharat Mediratta
d8807a7ad8
Remove spurious module::is_active("3nids") calls since it's all now in the theme.
2009-11-27 16:00:36 -08:00
Bharat Mediratta
094937a3a3
whitespace.
2009-11-27 15:56:06 -08:00
Bharat Mediratta
863146972b
Whitespace fix.
2009-11-27 15:55:53 -08:00
Bharat Mediratta
481da56ead
Get rid of the specialized photos_3nids controller and use the base
...
photos controller. Override photo.html.php to do the simplified
rendering of the image in a lightbox.
2009-11-27 15:36:04 -08:00
Bharat Mediratta
7f3c8db181
Fix indentation.
2009-11-27 15:32:01 -08:00
Bharat Mediratta
a13bf06f36
Change the mods on all files to 644
2009-11-27 15:27:13 -08:00
Bharat Mediratta
6c1c44fbec
Can't have a class name that begins with a digit, so rename this back
...
to theme_3nids.
2009-11-27 15:23:19 -08:00
Bharat Mediratta
9a7f7ff22d
Rename "theme_3nids" to "3nids" in module vars.
2009-11-27 15:21:05 -08:00
Bharat Mediratta
1447920592
Revert "Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module."
...
This reverts commit e8302ffcc8
.
Conflicts:
themes/3nids/views/album.html.php
2009-11-27 15:20:17 -08:00
Bharat Mediratta
fe468a6014
Add spaces after commas.
2009-11-27 15:15:03 -08:00
Bharat Mediratta
e8302ffcc8
Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module.
2009-11-27 15:14:21 -08:00
Bharat Mediratta
97db9f478e
Updated to reflect the fact that we've gotten rid of REST_Controller
...
Updated for changes in the paginator..
2009-11-27 15:13:17 -08:00
Bharat Mediratta
f9cdd21db0
Normalize code style.
2009-11-27 15:11:10 -08:00
Bharat Mediratta
77dd601c2d
Normalize indentation.
2009-11-27 15:04:19 -08:00
Bharat Mediratta
9d36e222cb
Clean up indentation and variable naming to closer match G3 standards.
2009-11-27 14:58:01 -08:00
Bharat Mediratta
937b4cb99d
Restructure the 3nids theme into a more standard layout. Delete the
...
tagsmap module with the expectation that any changes/additions will be
merged into the existing tagsmap module.
2009-11-27 14:41:47 -08:00
Bharat Mediratta
6547d54e72
Fix a blown merge and bring calendarview up to date with rWatcher's
...
changes.
2009-11-26 11:21:51 -08:00
Bharat Mediratta
55f806b754
Merge branch 'master' of git://github.com/rWatcher/gallery3-contrib
...
Conflicts:
modules/calendarview/controllers/calendarview.php
modules/calendarview/libraries/Calendar_Breadcrumb.php
modules/calendarview/views/kohana_calendar.php
2009-11-26 11:13:21 -08:00
rWatcher
8ca9f9e780
Added a month view and breadcrumbs to album view.
2009-11-27 03:09:40 +08:00
Chad Kieffer
24ad098f23
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-26 11:12:01 -07:00
Bharat Mediratta
07bb2625df
Beginning framework for the remote module
2009-11-23 22:30:55 -08:00
Chad Kieffer
6d8f000ccc
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-18 19:04:34 -07:00
rWatcher
11153056f1
Code cleanup.
2009-11-18 19:04:47 -05:00
rWatcher
92e97357e5
Translation Fix.
2009-11-18 18:35:31 -05:00
rWatcher
229c488436
Merge commit 'gallery3-contrib/master'
2009-11-18 15:03:53 -05:00
rWatcher
47d1f16b40
Added a month view and breadcrumbs to album view.
2009-11-18 15:03:16 -05:00
Tim Almdal
b1119d82f1
Revert "Add xss_golden files to some modules."
...
This reverts commit e20cfc8494
.
2009-11-18 10:53:02 -08:00
Tim Almdal
e20cfc8494
Add xss_golden files to some modules.
2009-11-18 10:37:31 -08:00
Tim Almdal
984c42edbf
Add quotes around the module name
2009-11-18 08:58:57 -08:00
rWatcher
9f2a08411c
Merge commit 'gallery3-contrib/master'
...
Conflicts:
modules/calendarview/controllers/calendarview.php
2009-11-18 00:33:19 -05:00
Bharat Mediratta
85570acabd
Merge branch 'master' of git@github.com:gallery/gallery3-contrib
...
Conflicts:
modules/calendarview/controllers/calendarview.php
2009-11-17 15:55:19 -08:00
Bharat Mediratta
99ec99a166
Update to use the new page_type and page_subtype designations.
2009-11-17 14:06:04 -08:00
rWatcher
59648ce716
Move the CSS from the view file into a seperate .css file.
2009-11-18 02:11:19 +08:00
rWatcher
72a1019256
Remove "overlap dates" from calendar view.
2009-11-18 02:11:19 +08:00