Commit Graph

278 Commits

Author SHA1 Message Date
Zach Copley
89d0583b91 Fixes Ticket #1607 - empty 'page-notice' definition lists were
being output in a bunch of places.
2009-06-12 17:06:42 -07:00
Evan Prodromou
c0853e3040 Merge branch '0.7.x' into 0.8.x 2009-06-10 09:09:57 -07:00
Evan Prodromou
f4a1cd75ab Remove FIXME-marked Opera links until they actually work 2009-06-10 08:47:46 -07:00
Sarven Capadisli
8b5bcae58f Merge branch '0.7.x' into 0.8.x
Conflicts:

	EVENTS.txt
2009-05-18 23:28:08 +00:00
Evan Prodromou
9d13890a85 add a hook for the page notice 2009-05-15 17:11:28 -04:00
Robin Millette
fecb8c706d Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments. 2009-05-15 15:04:58 -04:00
Evan Prodromou
c6816c163e reformat action.php 2009-05-15 14:18:04 -04:00
Evan Prodromou
55d7bb4701 Merge branch '0.7.x' into 0.8.x 2009-04-15 11:35:43 -04:00
Evan Prodromou
573d4cf0fb Merge branch 'nobase' into 0.7.x 2009-04-15 11:31:57 -04:00
Evan Prodromou
5ff8d8d447 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Conflicts:
	actions/public.php
2009-04-15 10:25:26 -04:00
Adrian Lang
99f4367d03 Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.
These changes add opera-readable prev/next relations.
2009-04-15 09:38:19 +02:00
Sarven Capadisli
7095c93f66 Simpler separation of themes. New themes can either make use of the
default styles or make their own.
2009-04-14 23:13:02 +00:00
Evan Prodromou
b142c26010 Make stuff work with no base 2009-04-14 16:02:09 -04:00
Evan Prodromou
41b247ac1a Merge branch '0.7.x' into 0.8.x 2009-04-14 14:29:51 -04:00
Evan Prodromou
4684d34713 typo in lib action 2009-04-13 15:54:16 -04:00
Evan Prodromou
e9e75fc9d5 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Sarven Capadisli
030477b02a Separation of themes (i.e., layout, typography) and skins (i.e., background
images, colours).

A theme can have multiple skins.

Majority of the changes in this commit are due to restructuring the
path/files for themes and skins.

Both theme and skin will be set to 'default' if not set in
config.php.

This commit also allows each instance of this software to create
its own theme without having to override any style from the default
distribution.

Added Cloudy theme.
2009-04-12 02:08:55 +00:00
Sarven Capadisli
e5657ca4bb Merge branch '0.7.x' into 0.8.x 2009-04-08 22:55:13 +00:00
Evan Prodromou
00dfdb3f3a Merge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjesse-clone/master 2009-04-07 22:32:58 -04:00
Evan Prodromou
92d18134bf Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-07 17:14:10 -04:00
Sarven Capadisli
ef2d22a84b Rearranged the global navigation items for better usability. Reason a)
placement of Search at the edge of the viewport for quicker access and
b) placement of the links that are always available (whether user is logged in
or not) in the same location (i.e., Login/Logout, Help, Search)
2009-04-07 18:09:54 +00:00
Sarven Capadisli
7f5e2c5e57 Added Invite link to global navigation 2009-04-07 18:08:56 +00:00
Evan Prodromou
4cc6d0ea2c make tags in list work 2009-04-07 11:40:13 -04:00
Sarven Capadisli
798984381f Merge branch '0.7.x' into 0.8.x 2009-04-02 06:44:54 +00:00
Sarven Capadisli
b112b32640 Selector to allow styles when a user is logged in. 2009-04-01 01:03:00 +00:00
Brian
214468d17e added a few Laconica events 2009-03-23 21:48:04 -07:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
Meitar Moscovitz
91b0fb8028 Add apple-touch-icon.png support; favicons for the iPhone OS. 2009-03-16 18:04:27 -04:00
Meitar Moscovitz
85d61475aa Output code to explicitly reference favicons.
This makes favicons work when Laconica is not installed at a web
server's DOCUMENT_ROOT. I've also added the capability to override the
Laconica default favicon.ico file with a theme-specific one simply by
dropping a themed favicon.ico in the appropriate theme directory.
2009-03-16 17:42:24 -04:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04:00
Evan Prodromou
e185c0395a Revert "trac #201 Add flowplayer to enable multimedia playback capability."
This reverts commit 9c9b6790ce.

This code wasn't ready for release, so I've reverted it for now.

Conflicts:

	lib/action.php
	lib/util.php
2009-03-12 00:13:28 -04:00
Adrian Lang
c0f44ca44d Check if that $_SERVER param is set before accessing. 2009-03-11 10:39:43 +01:00
Evan Prodromou
13c183e2f4 Merge branch '0.7.x' into 0.8.x 2009-03-06 16:17:58 -08:00
Evan Prodromou
c0115bf3bc fix pagination links with new URL mapper 2009-03-04 05:29:21 -08:00
Evan Prodromou
fc44c9a7f4 Merge branch '0.7.x' into 0.8.x 2009-02-28 21:11:16 -08:00
Evan Prodromou
ee92d0b0a8 fix notice in action with caching 2009-02-26 13:36:27 -08:00
Sarven Capadisli
7af6f5392b Hook for setting document content type, charset, language, DOCTYPE and
html element properties
2009-02-26 19:56:31 +00:00
Sarven Capadisli
d30590de23 Print stylesheet 2009-02-24 04:31:31 +00:00
Zach Copley
b9f3e1e01e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-20 17:19:08 -08:00
Zach Copley
1fdb35bbf1 New doc page for Identi.ca badge and minor updates to badge's js 2009-02-20 17:17:20 -08:00
Sarven Capadisli
f75c2328cc Hooks for: local navigation 2009-02-20 23:47:24 +00:00
Evan Prodromou
c9def4a876 more correct handling of etags and last-modified 2009-02-18 23:43:26 +00:00
Meitar Moscovitz
cca1d77748 Merge branch 'dev-0.7.x' into framebusting
Conflicts:
	lib/action.php
2009-02-18 13:01:52 +11:00
Sarven Capadisli
2eb6a6a9b0 Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review
Conflicts:

	lib/action.php
2009-02-17 20:32:19 +00:00
Robin Millette
9c9b6790ce trac #201 Add flowplayer to enable multimedia playback capability. 2009-02-16 17:46:24 +00:00
Meitar Moscovitz
9d81cef5cc Add framebusting JavaScript to help avoid clickjacking attacks. 2009-02-16 15:45:18 +11:00
Sarven Capadisli
070d1a3f24 Hooks for: custom, laconica, UA specific stylesheets 2009-02-13 04:33:43 +00:00
Sarven Capadisli
dac8d103e6 Hooks for: header, contentblock, footer 2009-02-12 22:16:48 +00:00
Evan Prodromou
3b5fd8fb6b Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
This reverts commit 9f035e2847.

It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
This reverts commit 616bdd43a9.

Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Zach Copley
616bdd43a9 Just discovered the PEAR_Error handling function in index.php. Duh.
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley
9f035e2847 Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Evan Prodromou
22b10399aa Unify feeds definition in actions
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.

I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.

I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Meitar Moscovitz
beddf90663 Trigger only on handheld device screens, not on browser screens, d'oh! 2009-02-11 03:12:14 +11:00
Meitar Moscovitz
c9e8b1e5c3 Add streamlined mobile device-friendly styles when enabled in config.
A new mobile-specific style sheet is added and loaded only if the
`$config['site']['mobile']` configuration variable is set to true.
2009-02-11 03:03:16 +11:00
Meitar Moscovitz
b240a17194 Beginning to refactor document relationship links to reduce common code.
My attempts here are to mimic the `pagination()` method shared by
actions. I'm tentatively adding the `$count` property to actions so that
we can query the number of notices ''being displayed'' per page prior to
calling the actual `pagination()` method itself, since document
relationship `<link>` elements need to be output inside of `showHead()`,
before `showContent()`, which is where `pagination()` is, gets called.
2009-02-10 20:25:44 +11:00
Meitar Moscovitz
3585012380 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 18:28:12 +11:00
Evan Prodromou
32744124bc Add a hook for showing sidebar sections 2009-02-09 16:56:38 -05:00
Meitar Moscovitz
8cb3035b89 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 05:05:04 +11:00
Evan Prodromou
5d246299b6 add hooks for JavaScript handling 2009-02-09 08:24:23 -05:00
Evan Prodromou
05991e2206 First events for adding menu items 2009-02-09 08:02:23 -05:00
Evan Prodromou
55cba5007e Fix indentation in lib/action.php 2009-02-09 07:51:23 -05:00
Evan Prodromou
aa06d760b3 Index and Action use Exceptions
Main Web entry point accepts exceptions, and main code in Action
throws them.
2009-02-09 07:15:52 -05:00
Meitar Moscovitz
6e2f045837 Add machine-readable pagination using HTML4.01 <link rel="next">, etc.
These extra `<link>` elements only appear on pages where pagination
makes sense. They trigger functionality in some user agents, such as
Opera's Navigation Bar for more easily navigating forward and backwards
across a paged set of notices, messages, or group lists, etc.
2009-02-09 00:02:51 +11:00
Evan Prodromou
e8d3615b3f Allow HTML in site notice (Bug#1002) 2009-02-04 08:49:42 -05:00
Evan Prodromou
0356953cf8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x 2009-02-03 15:12:55 -05:00
Evan Prodromou
ab16bb876b Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-02 16:46:51 -05:00
Robin Millette
f9edd1101b trac #1099: main menu should not lead to IM settings when IM is disabled 2009-02-02 20:20:21 +00:00
Sarven Capadisli
4f1345620a Better cross-browser support for page and text zoom-in/out. 2009-02-02 14:14:14 +00:00
Sarven Capadisli
d309fd27c5 Rearraned stylesheet order for IE and fixed path to files for base IE stylesheets 2009-02-01 20:05:13 +00:00
Sarven Capadisli
add0b7f329 Resaved identica logo as transparent PNG24 in order to handle various
background colours without having to explicitly apply anti-aliasing.

Updated colour information in identica theme.

Removed ie7 base stylesheet that's no longer required.

Added ie identica stylesheet to handle solid background colour for
2009-02-01 18:04:56 +00:00
sarven
538518ead6 Not using thickbox... yet 2009-01-23 06:18:00 +00:00
Robin Millette
7f25b9db4b phpdocs 2009-01-22 04:22:32 +00:00
sarven
77a9b4b758 Moved minor dangling HTML. 2009-01-19 17:09:50 +00:00
sarven
042b01d169 Extracted the showLocalNav block information into its own method in
order to override it from other actions. This HTML need not be
outputted if there is no page_notice.
2009-01-19 17:04:59 +00:00
Evan Prodromou
582e2eefa3 Slightly better hover notices for global nav (glad it's there!) 2009-01-19 13:24:50 +00:00
Evan Prodromou
264ab53953 Merge branch 'uiredesign' of /var/www/trunk into uiredesign 2009-01-19 12:28:45 +00:00
sarven
8f9762aab1 Cross-browser stuff 2009-01-19 00:48:12 +00:00
sarven
910bd33243 Minimal cross browser styling (mostly IE7). w00t! 2009-01-19 00:10:42 +00:00
sarven
9d384aadb1 @id for site_nav_global_primary items in order to target for styling 2009-01-18 22:08:51 +00:00
sarven
5426c4ec6a Using config site name for creative commons bit. Fix i18n. 2009-01-18 19:58:28 +00:00
Evan Prodromou
2ca56c0bc6 Update caching methods to use camel case 2009-01-18 18:34:54 +00:00
Evan Prodromou
97c98cf59a Break up settings into two tabset
Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
2009-01-17 22:30:44 +00:00
sarven
e7687c66b2 Using @id instead of @class for navigation li 2009-01-17 06:33:45 +00:00
sarven
b9fb70ee70 Markup clean up and styles 2009-01-17 00:46:33 +00:00
sarven
9881932d07 Minor 2009-01-16 23:23:02 +00:00
sarven
b7dd4d2ad1 Fix to put @class current on the navigation of the page viewed 2009-01-16 23:13:22 +00:00
Evan Prodromou
69d6404f26 Merge branch 'uiredesign' of /var/www/trunk into uiredesign 2009-01-16 19:59:27 +00:00
Evan Prodromou
ed2fd6da6b self_url -> selfUrl 2009-01-16 19:59:16 +00:00
sarven
877327a18e Update to XHR post notice 2009-01-16 17:02:46 +00:00
sarven
eacb8df691 Added jquery.form.js 2009-01-16 16:17:27 +00:00
sarven
4549e577ac Updating Creative Commons text and image 2009-01-16 15:52:17 +00:00
Evan Prodromou
20b4cae84a Put action name as body ID 2009-01-16 15:38:35 +00:00
sarven
1e8bb6bb31 Minor 2009-01-16 15:25:22 +00:00
Evan Prodromou
ba1e36dd49 Fix use of $config in Action 2009-01-16 02:21:58 +00:00
sarven
d3092274c2 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:47:43 +00:00
Evan Prodromou
16619439ab Move some accounting stuff from publicgroupnav to action
More dl's and dd's. Rather than replicate them in every sub-class,
let's just put them in one place.
2009-01-15 23:44:19 +00:00
sarven
33ee34dc26 Merge branch 'uiredesign' of ../evan into uiredesign
Conflicts:

	lib/action.php
2009-01-15 23:18:56 +00:00
Evan Prodromou
a22714b5ee Fix errant } in action 2009-01-15 23:15:13 +00:00
sarven
39b5957068 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:10:44 +00:00
Evan Prodromou
f294eab92a is_readonly() -> isReadOnly() 2009-01-15 23:07:49 +00:00
sarven
0357ea505d Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:05:57 +00:00
Evan Prodromou
4b0cf99e56 Convert use of common_server_error and common_user_error to methods on Action 2009-01-15 23:03:38 +00:00
sarven
bb58bf8caf Minor parse error 2009-01-15 23:02:48 +00:00
Evan Prodromou
eaa81d25fa Convert all actions to use new UI functions
I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step
2009-01-15 22:57:15 +00:00
Evan Prodromou
2b2fb27621 Fix use of $config in licenses 2009-01-15 22:40:56 +00:00
Evan Prodromou
d012bdabde Show NoticeForm only if logged in 2009-01-15 22:25:26 +00:00
sarven
d6d9a0a981 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 22:19:53 +00:00
Evan Prodromou
a72ae0f4df Move wrapper for content 2009-01-15 22:17:48 +00:00
sarven
18dc498a6a Added aside_primary id 2009-01-15 22:00:48 +00:00
Evan Prodromou
5b61f459d6 Merge branch 'uiredesign' of ../csarven into uiredesign 2009-01-15 21:40:37 +00:00
Evan Prodromou
2c84f077a2 Add aside div 2009-01-15 21:39:48 +00:00
sarven
4f3f23c61a core uses id 2009-01-15 21:34:33 +00:00
Evan Prodromou
2a5da870cb Change multiple id=nav to class=nav 2009-01-15 21:33:45 +00:00
sarven
60fa833908 changed to class nav from id 2009-01-15 21:30:23 +00:00
Evan Prodromou
9bed97a36c Move ID param to end of menuItem and fix bad 'wrap' element 2009-01-15 21:19:23 +00:00
Evan Prodromou
7233e89be6 Merge ../csarven into uiredesign
Conflicts:

	lib/action.php
2009-01-15 20:54:03 +00:00
Evan Prodromou
c42b883086 Fix dd in action
I think these definition lists are ridiculous, and I particularly
resent having to debug them.
2009-01-15 20:31:17 +00:00
Evan Prodromou
443e4a48c7 Fix site notice 2009-01-15 20:27:33 +00:00
Evan Prodromou
62ed9d3e73 Fix called to text and raw in action.php 2009-01-15 20:24:54 +00:00
sarven
c08eadc774 HTML update to showSecondaryNav() 2009-01-15 20:24:41 +00:00
sarven
186783f45b Missing end dl tag for showPageNotice() 2009-01-15 20:20:03 +00:00
sarven
e55c9e559d Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 20:14:28 +00:00
Evan Prodromou
21c396202e Add arg to NoticeForm constructor 2009-01-15 15:11:55 -05:00
sarven
edf84cca04 showSiteNotice() was missing closing dl tag 2009-01-15 20:10:20 +00:00
sarven
b3c171d317 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 20:05:09 +00:00
Evan Prodromou
73c1390eb1 Fix notice form in action 2009-01-15 14:56:40 -05:00
Evan Prodromou
7e316abe92 Move optional id param to end of function, where optional params
actually go.
2009-01-15 14:45:08 -05:00
sarven
d8f9628a17 Using a specific path for CSS files. 2009-01-15 19:33:45 +00:00
Evan Prodromou
34d859c4a6 Add a menuItem method to Action 2009-01-15 14:31:03 -05:00
Evan Prodromou
6a8be40a8c elementElement() -> elementEnd() in Action 2009-01-15 14:24:54 -05:00
Evan Prodromou
8ff6dc8e32 startElement() -> elementStart() in Action 2009-01-15 14:23:28 -05:00
Evan Prodromou
ff901332d2 Fix the constructor for Action
Also, fix the startXML() method
2009-01-15 14:21:47 -05:00
sarven
caaf237de8 Base theme stylesheet includes layout, and typography information
Identica theme stylesheet includes colour and background information
2009-01-14 22:19:17 +00:00
Evan Prodromou
3ce62aae1b Add comment() method, have action use it 2009-01-14 13:57:29 -05:00
sarven
b72322b9e7 Parse error fix 2009-01-14 17:30:03 +00:00
sarven
f8b7589324 showBody() -- revisit to add @id and @class to <body>
showContentBlock()
showContent()

added endHTML() to class HTMLOutputter
2009-01-14 17:26:23 +00:00
Evan Prodromou
efe9d28efa Add notice form 2009-01-14 12:01:53 -05:00
sarven
24d8814bc5 Updated:
showHeader() -- incomplete
showPrimaryNav() -- should be updated when common_menu_item() is
redone/fixed
showSiteNotice()
showLocalNav() -- needs a revisit for common_menu_item()
showContentBlock -- needs a revisit for basic pages
showPageNotice()
showContent() -- inner should be opened for content
showFooter()
showLicenses()
showLaconicaLicense()
showContentLicense()
common_menu_item() -- Added @id for list-items. Revisit.
pagination()

Needs attention for common_menu_item() and then they can be removed:
nav_menu
common_show_header()
2009-01-14 08:44:23 +00:00
Evan Prodromou
0f7e8585cd Update lib/action.php to use the right XMLOutputter functions
Global search and replace for common_element_*
2009-01-14 01:59:30 -05:00
sarven
3c283332b6 Updated showLogo(). 2009-01-14 06:34:22 +00:00
Evan Prodromou
0093b035c1 Modify public stream to use new UI framework
I modified public.php to use the new UI framework. Since the Action
class isn't functional yet, I don't know if it works.

I took some of the functionality, like the public tabs nav and the
feeds list, and made them widgets.

I also moved the navigation from common_navigation() to a method of
Action.
2009-01-13 23:48:05 -05:00
Evan Prodromou
93e249de2a Move page-generation code from lib/util.php to Action class
We moved the page generation code from lib/util.php to the action class.

We also broke up the page generation code into a big recipe, where
each element of the page has a corresponding method in the Action
class. Action classes can override parts of the recipe to make their
custom output, and leave the rest up to the parent class.

NOTE: this change BREAKS pretty much everything. lib/action.php probably
does not compile, and everything that uses it needs to be fixed to use
the new framework. Stay tuned for more fun!
2009-01-13 13:41:39 -05:00
Evan Prodromou
01a548a9fb some modifications to assuage phpcs
darcs-hash:20081221003955-84dde-d6e8067a579f70dcb707f4525e588920a2375f5c.gz
2008-12-20 19:39:55 -05:00
Evan Prodromou
96df5916ad change Action::init() to Action::prepare() to avoid conflict with RSS10Action::init()
darcs-hash:20081203173225-5ed1f-e5ebfb202ed4a84c90851d0faa025ad09774d2c3.gz
2008-12-03 12:32:25 -05:00
Evan Prodromou
df5ce60edc better HTTP timestamp
darcs-hash:20081202044441-5ed1f-63025fde108bff917253995f448f841160c8e394.gz
2008-12-01 23:44:41 -05:00
Evan Prodromou
be33850c5f add ETag handling
darcs-hash:20081202044211-5ed1f-d8779be7681fc21eebff3c0c56fdde892c2fa3da.gz
2008-12-01 23:42:11 -05:00
Evan Prodromou
cad6f78fe6 better header for not-modified message
darcs-hash:20081202042334-5ed1f-47957bc0ad54d0250a0638b4e6e5a200dac1d335.gz
2008-12-01 23:23:34 -05:00
Evan Prodromou
fd7bc1f565 better logic for if-modified-since
darcs-hash:20081202042159-5ed1f-16cbaa0253b6b60033bf842dff88b097a41ea328.gz
2008-12-01 23:21:59 -05:00
Evan Prodromou
cb3862b43e whitespace changes in action.php
darcs-hash:20081202041532-5ed1f-8c392967eb14d726bc1b761a39c6dce0097879c0.gz
2008-12-01 23:15:32 -05:00