web/CityofMI.git
11 years agoadd robots.txt
Steve Sutton [Mon, 4 Aug 2014 12:48:54 +0000 (08:48 -0400)]
add robots.txt

11 years agoRemove develop setting for search
Steve Sutton [Fri, 1 Aug 2014 14:21:08 +0000 (10:21 -0400)]
Remove develop setting for search

trying to get search to show up on devlopment server but it seems that
the search engine is not setup correctly.

11 years agofixed links to superfish files in header, and disbaled arrows in the js call
Ove Klykken [Thu, 31 Jul 2014 20:30:01 +0000 (16:30 -0400)]
fixed links to superfish files in header, and disbaled arrows in the js call

11 years agoadded dropdown menu styles
Ove Klykken [Thu, 31 Jul 2014 20:29:25 +0000 (16:29 -0400)]
added dropdown menu styles

11 years agolink colors
Ove Klykken [Thu, 31 Jul 2014 20:29:03 +0000 (16:29 -0400)]
link colors

11 years agounbolded link to current page
Ove Klykken [Thu, 31 Jul 2014 20:27:40 +0000 (16:27 -0400)]
unbolded link to current page

11 years agoadded class to main nav ul
Ove Klykken [Thu, 31 Jul 2014 20:27:08 +0000 (16:27 -0400)]
added class to main nav ul

11 years agoAdd all sub levels for main navigation
Steve Sutton [Thu, 31 Jul 2014 17:52:02 +0000 (13:52 -0400)]
Add all sub levels for main navigation

Adding all the sub levels for main nav.
First level used is controlled by the define for MAIN_LEVEL_NAV_ARRAY
in setup.phtml.

11 years agolinking in new js and css files
Ove Klykken [Thu, 31 Jul 2014 17:38:58 +0000 (13:38 -0400)]
linking in new js and css files

11 years ago-Footer link names bold.
Ove Klykken [Thu, 31 Jul 2014 17:38:07 +0000 (13:38 -0400)]
-Footer link names bold.
-Bold GLM headers.
-Toolbox headers got increased top margin.
-Added right side margin to the content for more breathing room.

11 years agonew files for dropdown
Ove Klykken [Thu, 31 Jul 2014 17:36:51 +0000 (13:36 -0400)]
new files for dropdown

11 years agoUpdate so the calendar links from home work
Steve Sutton [Wed, 30 Jul 2014 20:29:04 +0000 (16:29 -0400)]
Update so the calendar links from home work

build the start and end date for search if you get link from the
calendar on the home page.

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Wed, 30 Jul 2014 19:44:44 +0000 (15:44 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agodata-equalizer for bottom list. Also had to reorder them.
Ove Klykken [Wed, 30 Jul 2014 19:43:10 +0000 (15:43 -0400)]
data-equalizer for bottom list. Also had to reorder them.

11 years agoadjusted the calendar on home page to work in FF
Ove Klykken [Wed, 30 Jul 2014 19:42:22 +0000 (15:42 -0400)]
adjusted the calendar on home page to work in FF

11 years agono change raelly. deleted a few empty lines
Ove Klykken [Wed, 30 Jul 2014 19:41:43 +0000 (15:41 -0400)]
no change raelly. deleted a few empty lines

11 years agoReemove script tag
Steve Sutton [Wed, 30 Jul 2014 19:04:56 +0000 (15:04 -0400)]
Reemove script tag

Not needed and interferes with the ajax search name for events.

11 years agoUpdate for dev glmsearch
Steve Sutton [Wed, 30 Jul 2014 17:42:09 +0000 (13:42 -0400)]
Update for dev glmsearch

setup glm search for dev

11 years agocentering buttons
Ove Klykken [Wed, 30 Jul 2014 17:07:57 +0000 (13:07 -0400)]
centering buttons

11 years agonew button
Ove Klykken [Wed, 30 Jul 2014 17:07:26 +0000 (13:07 -0400)]
new button

11 years agomoving events css to it'as correct file
Ove Klykken [Tue, 29 Jul 2014 20:49:35 +0000 (16:49 -0400)]
moving events css to it'as correct file

11 years agoadding custom colors
Ove Klykken [Tue, 29 Jul 2014 20:44:55 +0000 (16:44 -0400)]
adding custom colors

11 years agoremoving reduneant inline styles. moving columns around.
Ove Klykken [Tue, 29 Jul 2014 20:44:22 +0000 (16:44 -0400)]
removing reduneant inline styles. moving columns around.

11 years agomost style edits to the events page is done here
Ove Klykken [Tue, 29 Jul 2014 20:43:23 +0000 (16:43 -0400)]
most style edits to the events page is done here

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Tue, 29 Jul 2014 20:36:07 +0000 (16:36 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

Conflicts:
Toolkit/Events/views/eventSearchForm.html

11 years agoevent templates
Steve Sutton [Tue, 29 Jul 2014 19:36:37 +0000 (15:36 -0400)]
event templates

update url for resources

11 years agonew buttons
Ove Klykken [Tue, 29 Jul 2014 18:33:22 +0000 (14:33 -0400)]
new buttons

11 years agojust moving the breakpoint on home calendar a little
Ove Klykken [Tue, 29 Jul 2014 18:32:46 +0000 (14:32 -0400)]
just moving the breakpoint on home calendar a little

11 years agoadding back correct logo
Ove Klykken [Tue, 29 Jul 2014 18:32:12 +0000 (14:32 -0400)]
adding back correct logo

11 years agonew path to buttons
Ove Klykken [Tue, 29 Jul 2014 18:31:46 +0000 (14:31 -0400)]
new path to buttons

11 years agonew filesO
Ove Klykken [Tue, 29 Jul 2014 18:30:38 +0000 (14:30 -0400)]
new filesO

11 years agoremoving misc styles to get back to barebones
Ove Klykken [Tue, 29 Jul 2014 18:29:57 +0000 (14:29 -0400)]
removing misc styles to get back to barebones

11 years agofoundation column rework
Ove Klykken [Tue, 29 Jul 2014 16:55:35 +0000 (12:55 -0400)]
foundation column rework

11 years agomisc removal of old styles
Ove Klykken [Tue, 29 Jul 2014 16:54:43 +0000 (12:54 -0400)]
misc removal of old styles

11 years agomargin above submit button
Ove Klykken [Tue, 29 Jul 2014 16:53:51 +0000 (12:53 -0400)]
margin above submit button

11 years agoremoving inline CSS
Ove Klykken [Tue, 29 Jul 2014 16:52:54 +0000 (12:52 -0400)]
removing inline CSS

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Tue, 29 Jul 2014 14:57:31 +0000 (10:57 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoevent templates
Steve Sutton [Tue, 29 Jul 2014 14:57:16 +0000 (10:57 -0400)]
event templates

add template for search form

11 years agosetup emails for production
Steve Sutton [Tue, 29 Jul 2014 14:53:55 +0000 (10:53 -0400)]
setup emails for production

update emails to clerk@cityofmi.org

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Tue, 29 Jul 2014 14:36:07 +0000 (10:36 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agofor ignore of smarty
Steve Sutton [Tue, 29 Jul 2014 14:35:35 +0000 (10:35 -0400)]
for ignore of smarty

11 years agoevent config update
Steve Sutton [Tue, 29 Jul 2014 14:34:09 +0000 (10:34 -0400)]
event config update

for removing old css files that conflict with foundation
and add new local stylesheet

11 years agovarious home page events styles
Ove Klykken [Tue, 29 Jul 2014 14:03:09 +0000 (10:03 -0400)]
various home page events styles

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Tue, 29 Jul 2014 14:00:59 +0000 (10:00 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

Conflicts:
templates/template.html

11 years agoclearfix on event links
Ove Klykken [Tue, 29 Jul 2014 13:59:27 +0000 (09:59 -0400)]
clearfix on event links

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Tue, 29 Jul 2014 13:55:49 +0000 (09:55 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoRemoving events.css from the calendar page
Laury GvR [Tue, 29 Jul 2014 13:53:15 +0000 (09:53 -0400)]
Removing events.css from the calendar page

A light work-around to get events.css (from app.gaslightmedia.com) to be
removed from the event calendar (-10) page, like 1140.css, using jquery.

11 years agoChuck's update to GLMSearch
Steve Sutton [Tue, 29 Jul 2014 13:38:48 +0000 (09:38 -0400)]
Chuck's update to GLMSearch

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Steve Sutton [Tue, 29 Jul 2014 13:21:24 +0000 (09:21 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoChuck's update to GLMSearch
Steve Sutton [Tue, 29 Jul 2014 13:21:03 +0000 (09:21 -0400)]
Chuck's update to GLMSearch

11 years agoEvents Calendar items displayed limiting
Laury GvR [Tue, 29 Jul 2014 13:03:51 +0000 (09:03 -0400)]
Events Calendar items displayed limiting

Now using flexy, not php, in template.html to limit the number of items
in existence, not just visible, on the events calendar as seen on the
homepage, to four.

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Steve Sutton [Mon, 28 Jul 2014 20:50:01 +0000 (16:50 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agonew logo file and calendar styles
Ove Klykken [Mon, 28 Jul 2014 20:45:08 +0000 (16:45 -0400)]
new logo file and calendar styles

11 years agorespniveness of calendar on home page. removed some commented out code.
Ove Klykken [Mon, 28 Jul 2014 19:39:48 +0000 (15:39 -0400)]
respniveness of calendar on home page. removed some commented out code.

11 years agoadding float left to two main columns
Ove Klykken [Mon, 28 Jul 2014 18:49:14 +0000 (14:49 -0400)]
adding float left to two main columns

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Mon, 28 Jul 2014 18:43:40 +0000 (14:43 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoAdding foundation tags to output.
Ove Klykken [Mon, 28 Jul 2014 18:40:33 +0000 (14:40 -0400)]
Adding foundation tags to output.
styles: undoing some common set styles

11 years agoclean up fix up
Laury GvR [Mon, 28 Jul 2014 18:39:54 +0000 (14:39 -0400)]
clean up fix up

Script to remove 1140.css from calendar static 10 now uses $= (endswith)

11 years agoUpdate config file
Steve Sutton [Mon, 28 Jul 2014 18:35:01 +0000 (14:35 -0400)]
Update config file

Update known emails

11 years agoUse Foundation markup on form
Steve Sutton [Mon, 28 Jul 2014 18:01:57 +0000 (14:01 -0400)]
Use Foundation markup on form

Style the form with markup from Foundation form

11 years agoAdd photoswipe for photos
Steve Sutton [Mon, 28 Jul 2014 17:44:10 +0000 (13:44 -0400)]
Add photoswipe for photos

Needed for the Image Library

11 years agoAdding mobile menu
Steve Sutton [Mon, 28 Jul 2014 17:43:19 +0000 (13:43 -0400)]
Adding mobile menu

Adding the arrowMenu css and js file and update Toolkit_Page for the
correct menu for mobile.

11 years agosearch engine
Steve Sutton [Mon, 28 Jul 2014 17:05:47 +0000 (13:05 -0400)]
search engine

update site for search engine

11 years agosearch engine
Steve Sutton [Mon, 28 Jul 2014 17:03:40 +0000 (13:03 -0400)]
search engine

add class for the glm search engine

11 years agoUpdate code for sitesearch
Steve Sutton [Mon, 28 Jul 2014 16:38:56 +0000 (12:38 -0400)]
Update code for sitesearch

from Chuck's update in demo

11 years agoclean up
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.

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Steve Sutton [Mon, 28 Jul 2014 15:38:44 +0000 (11:38 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoClean up Events
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

11 years agoAdd templates for events
Steve Sutton [Mon, 28 Jul 2014 15:31:16 +0000 (11:31 -0400)]
Add templates for events

from V1

11 years agoAdded new header to contact form notification email
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@

11 years agonew newslstter header
Ove Klykken [Fri, 25 Jul 2014 21:07:32 +0000 (17:07 -0400)]
new newslstter header

11 years agoResposive part of slideshow and calendar column on home page
Ove Klykken [Fri, 25 Jul 2014 21:04:54 +0000 (17:04 -0400)]
Resposive part of slideshow and calendar column on home page

11 years ago-Toolbox images not floating on Small
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

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Fri, 25 Jul 2014 14:38:18 +0000 (10:38 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoFile added to enable site user area
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

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Fri, 25 Jul 2014 14:11:09 +0000 (10:11 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoNew list of effects
Ove Klykken [Fri, 25 Jul 2014 14:09:40 +0000 (10:09 -0400)]
New list of effects

11 years agoMinor edit to static calendar page
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

11 years agoRemoving 1140.css from the calendar page
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.

11 years agoWorking on making the columns responsive.
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

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Laury GvR [Thu, 24 Jul 2014 13:59:39 +0000 (09:59 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoUserArea files, Contact page
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.

11 years agonew nivo slider effects. added correct nivo slider size. added new container to site...
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.

11 years ago-fixed gap on home page
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

11 years agourls lowercase sldieshow image height copyright
Ove Klykken [Mon, 21 Jul 2014 21:11:08 +0000 (17:11 -0400)]
urls lowercase sldieshow image height copyright

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Mon, 21 Jul 2014 18:58:08 +0000 (14:58 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoEvents output adjusted.
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

11 years agoMain page events under calendar limited to 2 events
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.

11 years agoEvents output adjusted.
Ove Klykken [Mon, 21 Jul 2014 18:08:40 +0000 (14:08 -0400)]
Events output adjusted.
slideshow controller bottom center
main nav hover effect

11 years agologo in admin. calendar work on home page
Ove Klykken [Mon, 21 Jul 2014 17:37:21 +0000 (13:37 -0400)]
logo in admin. calendar work on home page

11 years agosubnav marker. misc styles and template
Ove Klykken [Mon, 21 Jul 2014 15:17:28 +0000 (11:17 -0400)]
subnav marker. misc styles and template

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Mon, 21 Jul 2014 13:13:54 +0000 (09:13 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoPhotos application files added
Laury GvR [Mon, 21 Jul 2014 13:12:07 +0000 (09:12 -0400)]
Photos application files added

Photos application files added

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
Ove Klykken [Mon, 21 Jul 2014 13:04:29 +0000 (09:04 -0400)]
Merge branch 'develop' of cvs2:web/CityofMI into develop

11 years agoPut URLs and mailtos into anchors
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

11 years agoevents cal on home page
Ove Klykken [Fri, 18 Jul 2014 15:14:42 +0000 (11:14 -0400)]
events cal on home page

11 years agoAdding more to template
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

11 years agoSetting up Events
Steve Sutton [Thu, 17 Jul 2014 20:16:10 +0000 (16:16 -0400)]
Setting up Events

Output into template

11 years agoMerge branch 'develop' of cvs2:web/CityofMI into develop
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

11 years agoFirst initial commit
Ove [Thu, 17 Jul 2014 19:31:54 +0000 (15:31 -0400)]
First initial commit