summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Steve Sutton [Mon, 28 Jul 2014 15:43:03 +0000 (11:43 -0400)]
clean up
remove html tag
use shorter url for ~= so it won't need to be updated
when we go live.
Steve Sutton [Mon, 28 Jul 2014 15:38:44 +0000 (11:38 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Steve Sutton [Mon, 28 Jul 2014 15:37:59 +0000 (11:37 -0400)]
Clean up Events
Updated to common apps files only.
removed the other template and class files
Steve Sutton [Mon, 28 Jul 2014 15:31:16 +0000 (11:31 -0400)]
Add templates for events
from V1
Ove Klykken [Mon, 28 Jul 2014 13:19:40 +0000 (09:19 -0400)]
Added new header to contact form notification email
Added my email instead of leif@
Ove Klykken [Fri, 25 Jul 2014 21:07:32 +0000 (17:07 -0400)]
new newslstter header
Ove Klykken [Fri, 25 Jul 2014 21:04:54 +0000 (17:04 -0400)]
Resposive part of slideshow and calendar column on home page
Ove Klykken [Fri, 25 Jul 2014 16:30:12 +0000 (12:30 -0400)]
-Toolbox images not floating on Small
-Large toolbox images from Medium down.
-Main menu forced below logo when needed.
-Stopped GLM blocks for opening up new windows.
-Newsletter header
-Tested HTML Newsletter
Laury GvR [Fri, 25 Jul 2014 14:38:18 +0000 (10:38 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Fri, 25 Jul 2014 14:36:31 +0000 (10:36 -0400)]
File added to enable site user area
Registry.php added to enable a user area for the website, not just
the admin side. Source: cheboygancounty
Ove Klykken [Fri, 25 Jul 2014 14:11:09 +0000 (10:11 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Fri, 25 Jul 2014 14:09:40 +0000 (10:09 -0400)]
New list of effects
Laury GvR [Thu, 24 Jul 2014 20:38:40 +0000 (16:38 -0400)]
Minor edit to static calendar page
Removed an overseen ?> that was added during testing
Laury GvR [Thu, 24 Jul 2014 20:36:01 +0000 (16:36 -0400)]
Removing 1140.css from the calendar page
A light work-around to get 1140.css (from app.gaslightmedia.com) to be
removed from the event calendar (-10) page, using jquery.
Ove Klykken [Thu, 24 Jul 2014 19:09:32 +0000 (15:09 -0400)]
Working on making the columns responsive.
Sub, subsub, and subsubsubs.
Logo on top in Small.
Toolbox images for Small
Contact form made responsive
Laury GvR [Thu, 24 Jul 2014 13:59:39 +0000 (09:59 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Thu, 24 Jul 2014 13:18:02 +0000 (09:18 -0400)]
UserArea files, Contact page
Added UserArea files from Cheboygancounty, though only functional
under some circumstances. Added 10.phtml from Demo, static contacts.
Ove Klykken [Wed, 23 Jul 2014 21:11:29 +0000 (17:11 -0400)]
new nivo slider effects. added correct nivo slider size. added new container to site for shadow. new style for new shadow container.
Ove Klykken [Tue, 22 Jul 2014 21:00:14 +0000 (17:00 -0400)]
-fixed gap on home page
-removed all footer links, the URN part of it.
-margin on left for pages without subnav
-margin bottom for all toolbox content
-subnav marker works for two lines
Ove Klykken [Mon, 21 Jul 2014 21:11:08 +0000 (17:11 -0400)]
urls lowercase sldieshow image height copyright
Ove Klykken [Mon, 21 Jul 2014 18:58:08 +0000 (14:58 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Mon, 21 Jul 2014 18:57:57 +0000 (14:57 -0400)]
Events output adjusted.
slideshow controller bottom center
main nav hover effect
new flexy logic for side nav
Laury GvR [Mon, 21 Jul 2014 18:19:05 +0000 (14:19 -0400)]
Main page events under calendar limited to 2 events
The events under the calendar on the main page are now limited to only showing
two events. Currently using PHP to achieve this, but will try to switch to
flexy.
Ove Klykken [Mon, 21 Jul 2014 18:08:40 +0000 (14:08 -0400)]
Events output adjusted.
slideshow controller bottom center
main nav hover effect
Ove Klykken [Mon, 21 Jul 2014 17:37:21 +0000 (13:37 -0400)]
logo in admin. calendar work on home page
Ove Klykken [Mon, 21 Jul 2014 15:17:28 +0000 (11:17 -0400)]
subnav marker. misc styles and template
Ove Klykken [Mon, 21 Jul 2014 13:13:54 +0000 (09:13 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Mon, 21 Jul 2014 13:12:07 +0000 (09:12 -0400)]
Photos application files added
Photos application files added
Ove Klykken [Mon, 21 Jul 2014 13:04:29 +0000 (09:04 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Fri, 18 Jul 2014 20:58:58 +0000 (16:58 -0400)]
Put URLs and mailtos into anchors
Put URLs/catIDs and mailtos into anchors
Ove Klykken [Fri, 18 Jul 2014 15:14:42 +0000 (11:14 -0400)]
events cal on home page
Steve Sutton [Thu, 17 Jul 2014 21:01:21 +0000 (17:01 -0400)]
Adding more to template
add headlines
add link to one footer item
Steve Sutton [Thu, 17 Jul 2014 20:16:10 +0000 (16:16 -0400)]
Setting up Events
Output into template
Ove Klykken [Thu, 17 Jul 2014 19:39:27 +0000 (15:39 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop
Conflicts:
styles.css
Ove [Thu, 17 Jul 2014 19:31:54 +0000 (15:31 -0400)]
First initial commit
Ove [Thu, 17 Jul 2014 19:29:24 +0000 (15:29 -0400)]
Initial commit
Steve Sutton [Thu, 17 Jul 2014 19:23:47 +0000 (15:23 -0400)]
site cleanup
cleanup demo files
Steve Sutton [Thu, 17 Jul 2014 18:03:28 +0000 (14:03 -0400)]
Update server and site config files
use devdb for database host
use Full name for sitename
Laury GvR [Thu, 17 Jul 2014 14:14:15 +0000 (10:14 -0400)]
Initial Phing Setup
projects / web / CityofMI.git / log