web/Keweenaw.git
10 years agofix styles for add event form
Steve Sutton [Wed, 27 Aug 2014 16:26:05 +0000 (12:26 -0400)]
fix styles for add event form

switch to flexy template using the contact form one as a starting point.

10 years agosetup margin around top nav for members
Steve Sutton [Tue, 26 Aug 2014 16:12:45 +0000 (12:12 -0400)]
setup margin around top nav for members

10 years agofix for packages
Steve Sutton [Mon, 25 Aug 2014 20:34:43 +0000 (16:34 -0400)]
fix for packages

use 12 across for all sizes

10 years agoUpdate package template
Steve Sutton [Mon, 25 Aug 2014 20:31:46 +0000 (16:31 -0400)]
Update package template

Setup for foundation

10 years agoUpdate for member packages
Steve Sutton [Mon, 25 Aug 2014 20:10:40 +0000 (16:10 -0400)]
Update for member packages

bring in petoskey area style member packages

10 years agoUse Foundation sub-nav
Steve Sutton [Mon, 25 Aug 2014 19:10:39 +0000 (15:10 -0400)]
Use Foundation sub-nav

fix leads form to use the jquery-ui datepicker instead of the calendar
js that doesn't work with foundation.

10 years agoUpdate templates for the toolbox and member admin style
Steve Sutton [Mon, 25 Aug 2014 13:18:18 +0000 (09:18 -0400)]
Update templates for the toolbox and member admin style

This is for the member only section

10 years agoMembers Only Section
Steve Sutton [Fri, 22 Aug 2014 19:36:51 +0000 (15:36 -0400)]
Members Only Section

Updates for the member only section
These will need to be merged into demo also.

10 years agoMembers Only Section
Steve Sutton [Fri, 22 Aug 2014 19:35:57 +0000 (15:35 -0400)]
Members Only Section

Style updates for the Member Only section

10 years agoChange db for development
Steve Sutton [Fri, 22 Aug 2014 19:35:19 +0000 (15:35 -0400)]
Change db for development

Need to work on devdb database now that
the real site is live.

10 years agoWorking in members-only-area
Steve Sutton [Mon, 18 Aug 2014 12:31:36 +0000 (08:31 -0400)]
Working in members-only-area

add side nav
Rework for output of members only pages

Conflicts:
templates/toolbox.html

10 years agoMerge tag 'v1.0.27' into develop
Steve Sutton [Fri, 22 Aug 2014 16:57:17 +0000 (12:57 -0400)]
Merge tag 'v1.0.27' into develop

Version 1.0.27

10 years agoMerge branch 'hotfix/1.0.27' v1.0.27
Steve Sutton [Fri, 22 Aug 2014 16:56:51 +0000 (12:56 -0400)]
Merge branch 'hotfix/1.0.27'

10 years agoadding canonical urls
Steve Sutton [Fri, 22 Aug 2014 16:56:24 +0000 (12:56 -0400)]
adding canonical urls

This will give all pages their canonical url

10 years agoMerge tag 'v1.0.26' into develop
Steve Sutton [Fri, 22 Aug 2014 13:52:09 +0000 (09:52 -0400)]
Merge tag 'v1.0.26' into develop

Version 1.0.26

10 years agoMerge branch 'hotfix/1.0.26' v1.0.26
Steve Sutton [Fri, 22 Aug 2014 13:51:58 +0000 (09:51 -0400)]
Merge branch 'hotfix/1.0.26'

10 years agoUpdate on the link for pastys
Steve Sutton [Fri, 22 Aug 2014 13:51:02 +0000 (09:51 -0400)]
Update on the link for pastys

Add quotes around the href.
Add target _blank to anchor

10 years agoUpdate the background image for winter
Steve Sutton [Fri, 22 Aug 2014 13:50:14 +0000 (09:50 -0400)]
Update the background image for winter

new image to make the navigation look better.

10 years agoMerge tag 'v1.0.25' into develop
Steve Sutton [Fri, 22 Aug 2014 12:53:35 +0000 (08:53 -0400)]
Merge tag 'v1.0.25' into develop

Version 1.0.25

10 years agoMerge branch 'hotfix/1.0.25' v1.0.25
Steve Sutton [Fri, 22 Aug 2014 12:53:25 +0000 (08:53 -0400)]
Merge branch 'hotfix/1.0.25'

10 years agoChange email back in dev section
Steve Sutton [Fri, 22 Aug 2014 12:52:50 +0000 (08:52 -0400)]
Change email back in dev section

change back to dev

10 years agoMerge tag 'v1.0.22' into develop
Steve Sutton [Fri, 22 Aug 2014 12:47:23 +0000 (08:47 -0400)]
Merge tag 'v1.0.22' into develop

Version 1.0.22

10 years agoMerge branch 'hotfix/1.0.22' v1.0.22
Steve Sutton [Fri, 22 Aug 2014 12:46:54 +0000 (08:46 -0400)]
Merge branch 'hotfix/1.0.22'

10 years agoupdate code
Steve Sutton [Fri, 22 Aug 2014 12:46:34 +0000 (08:46 -0400)]
update code

for interest

10 years agoSet config file
Steve Sutton [Fri, 22 Aug 2014 12:29:11 +0000 (08:29 -0400)]
Set config file

Does not have trip planner so removing from config

10 years agoSetting up StreamSend
Steve Sutton [Fri, 22 Aug 2014 12:28:21 +0000 (08:28 -0400)]
Setting up StreamSend

Add the credentials for streamsend.
Setup email for vagrant

10 years agoMerge branch 'hotfix/1.0.24' into develop
Ian Weller [Thu, 21 Aug 2014 19:23:23 +0000 (15:23 -0400)]
Merge branch 'hotfix/1.0.24' into develop

10 years agoMerge branch 'hotfix/1.0.24' v1.0.24
Ian Weller [Thu, 21 Aug 2014 19:22:54 +0000 (15:22 -0400)]
Merge branch 'hotfix/1.0.24'

10 years agoAdded Pasty Central link and text
Ian Weller [Thu, 21 Aug 2014 19:18:36 +0000 (15:18 -0400)]
Added Pasty Central link and text

Added a new ul and an li a for the photo source.

10 years agoMerge tag 'V1.0.23' into develop
Laury GvR [Thu, 21 Aug 2014 18:22:21 +0000 (14:22 -0400)]
Merge tag 'V1.0.23' into develop

version 1.0.23

10 years agoMerge branch 'hotfix/1.0.23' V1.0.23
Laury GvR [Thu, 21 Aug 2014 18:22:14 +0000 (14:22 -0400)]
Merge branch 'hotfix/1.0.23'

10 years agoMore style hotfixing.
Laury GvR [Thu, 21 Aug 2014 18:21:53 +0000 (14:21 -0400)]
More style hotfixing.

10 years agoMerge tag 'V1.0.21' into develop
Laury GvR [Thu, 21 Aug 2014 18:06:07 +0000 (14:06 -0400)]
Merge tag 'V1.0.21' into develop

version 1.0.21

10 years agoMerge branch 'hotfix/1.0.21' V1.0.21
Laury GvR [Thu, 21 Aug 2014 18:05:55 +0000 (14:05 -0400)]
Merge branch 'hotfix/1.0.21'

10 years agoImage caption toolbox pages resizing.
Laury GvR [Thu, 21 Aug 2014 18:04:26 +0000 (14:04 -0400)]
Image caption toolbox pages resizing.

It was at 100% so would be significantly wider than the image.

10 years agoMerge tag 'V1.0.20' into develop
Laury GvR [Thu, 21 Aug 2014 14:41:10 +0000 (10:41 -0400)]
Merge tag 'V1.0.20' into develop

version 1.0.20

Conflicts:
Toolkit/Members/css/member.css

10 years agoMerge branch 'hotfix/1.0.20' V1.0.20
Laury GvR [Thu, 21 Aug 2014 14:39:33 +0000 (10:39 -0400)]
Merge branch 'hotfix/1.0.20'

10 years agoFix to fix the previous fix' weird GIT issues
Laury GvR [Thu, 21 Aug 2014 14:38:51 +0000 (10:38 -0400)]
Fix to fix the previous fix' weird GIT issues

Member search results formatting.. more.

10 years agoFixing search results styling, map resizing.
Laury GvR [Thu, 21 Aug 2014 14:17:26 +0000 (10:17 -0400)]
Fixing search results styling, map resizing.

10 years agoFixing search results styling, map resizing.
Laury GvR [Thu, 21 Aug 2014 14:17:26 +0000 (10:17 -0400)]
Fixing search results styling, map resizing.

10 years agoMore member search results formatting
Laury GvR [Wed, 20 Aug 2014 21:02:37 +0000 (17:02 -0400)]
More member search results formatting

10 years agoMore member search results formatting
Laury GvR [Wed, 20 Aug 2014 21:02:37 +0000 (17:02 -0400)]
More member search results formatting

10 years agoMerge tag 'v1.0.18' into develop
Steve Sutton [Wed, 20 Aug 2014 20:42:07 +0000 (16:42 -0400)]
Merge tag 'v1.0.18' into develop

Version 1.0.18

10 years agoMerge branch 'hotfix/1.0.18' v1.0.18
Steve Sutton [Wed, 20 Aug 2014 20:41:58 +0000 (16:41 -0400)]
Merge branch 'hotfix/1.0.18'

10 years agoRemove extra p tag in template
Steve Sutton [Wed, 20 Aug 2014 20:41:28 +0000 (16:41 -0400)]
Remove extra p tag in template

Block description already has p tags in them.

10 years agoMerge tag 'v1.0.17' into develop
Steve Sutton [Wed, 20 Aug 2014 20:10:52 +0000 (16:10 -0400)]
Merge tag 'v1.0.17' into develop

Version 1.0.17

10 years agoMerge branch 'hotfix/1.0.17' v1.0.17
Steve Sutton [Wed, 20 Aug 2014 20:10:40 +0000 (16:10 -0400)]
Merge branch 'hotfix/1.0.17'

10 years agoEvent detail update
Steve Sutton [Wed, 20 Aug 2014 20:10:11 +0000 (16:10 -0400)]
Event detail update

Add title and meta for event detail pages

10 years agoUpdate member profile layout
Steve Sutton [Wed, 20 Aug 2014 19:31:17 +0000 (15:31 -0400)]
Update member profile layout

use larger area for the image
larger for description if no attributes

10 years agoUpdate member profile layout
Steve Sutton [Wed, 20 Aug 2014 19:31:17 +0000 (15:31 -0400)]
Update member profile layout

use larger area for the image
larger for description if no attributes

10 years agoMerge tag 'V1.0.14' into develop
Laury GvR [Wed, 20 Aug 2014 18:44:42 +0000 (14:44 -0400)]
Merge tag 'V1.0.14' into develop

version 1.0.14

10 years agoMerge branch 'hotfix/1.0.14' V1.0.14
Laury GvR [Wed, 20 Aug 2014 18:44:26 +0000 (14:44 -0400)]
Merge branch 'hotfix/1.0.14'

10 years agoMember search results image resizing update
Laury GvR [Wed, 20 Aug 2014 18:43:24 +0000 (14:43 -0400)]
Member search results image resizing update

Now won't force them to be 100% width or 120px in height.

10 years agoMap resizing finally complete.
Laury GvR [Wed, 20 Aug 2014 18:34:35 +0000 (14:34 -0400)]
Map resizing finally complete.

Apparently Firefox mobile viewer is off by ~60 pixels.
Had to change media queries.

10 years agoMap resizing finally complete.
Laury GvR [Wed, 20 Aug 2014 18:34:35 +0000 (14:34 -0400)]
Map resizing finally complete.

Apparently Firefox mobile viewer is off by ~60 pixels.
Had to change media queries.

10 years agoMerge tag 'v1.0.13' into develop
Steve Sutton [Wed, 20 Aug 2014 18:21:06 +0000 (14:21 -0400)]
Merge tag 'v1.0.13' into develop

Version 1.0.13

10 years agoMerge branch 'hotfix/1.0.13' v1.0.13
Steve Sutton [Wed, 20 Aug 2014 18:20:58 +0000 (14:20 -0400)]
Merge branch 'hotfix/1.0.13'

10 years agoRedirects
Steve Sutton [Wed, 20 Aug 2014 18:20:38 +0000 (14:20 -0400)]
Redirects

From Anthony

10 years agoMerge tag 'v1.0.12' into develop
Steve Sutton [Wed, 20 Aug 2014 18:14:02 +0000 (14:14 -0400)]
Merge tag 'v1.0.12' into develop

Version 1.0.12

10 years agoMerge branch 'hotfix/1.0.12' v1.0.12
Steve Sutton [Wed, 20 Aug 2014 18:13:52 +0000 (14:13 -0400)]
Merge branch 'hotfix/1.0.12'

10 years agoFix bug with extra end div tag
Steve Sutton [Wed, 20 Aug 2014 18:12:45 +0000 (14:12 -0400)]
Fix bug with extra end div tag

remove extra tag

10 years agoMerge tag 'v1.0.11' into develop
Steve Sutton [Wed, 20 Aug 2014 18:06:22 +0000 (14:06 -0400)]
Merge tag 'v1.0.11' into develop

Version 1.0.11

10 years agoMerge branch 'hotfix/1.0.11' v1.0.11
Steve Sutton [Wed, 20 Aug 2014 18:06:12 +0000 (14:06 -0400)]
Merge branch 'hotfix/1.0.11'

10 years agoAdd google code
Steve Sutton [Wed, 20 Aug 2014 18:05:51 +0000 (14:05 -0400)]
Add google code

analytics

10 years agoMerge branch 'master' of cvs2:web/Keweenaw
Steve Sutton [Wed, 20 Aug 2014 17:38:39 +0000 (13:38 -0400)]
Merge branch 'master' of cvs2:web/Keweenaw

10 years agoFix for image right
Steve Sutton [Wed, 20 Aug 2014 17:37:52 +0000 (13:37 -0400)]
Fix for image right

close figure before the div

10 years agoMerge branch 'hotfix/1.0.10' v1.0.10
Steve Sutton [Wed, 20 Aug 2014 17:38:15 +0000 (13:38 -0400)]
Merge branch 'hotfix/1.0.10'

10 years agoFix for image right
Steve Sutton [Wed, 20 Aug 2014 17:37:52 +0000 (13:37 -0400)]
Fix for image right

close figure before the div

10 years agoChange offset on members search when on medium
Laury GvR [Wed, 20 Aug 2014 16:46:12 +0000 (12:46 -0400)]
Change offset on members search when on medium

10 years agoChange offset on members search when on medium
Laury GvR [Wed, 20 Aug 2014 16:46:12 +0000 (12:46 -0400)]
Change offset on members search when on medium

10 years agoMerge tag 'v1.0.7' into develop
Steve Sutton [Wed, 20 Aug 2014 16:46:07 +0000 (12:46 -0400)]
Merge tag 'v1.0.7' into develop

Version 1.0.7

10 years agoMerge branch 'hotfix/1.0.7' v1.0.7
Steve Sutton [Wed, 20 Aug 2014 16:45:58 +0000 (12:45 -0400)]
Merge branch 'hotfix/1.0.7'

10 years agoFixes for events
Steve Sutton [Wed, 20 Aug 2014 16:45:02 +0000 (12:45 -0400)]
Fixes for events

Fix for url's on the event detail page
Fix for the name search if nothing is put in than default to first page
of event list.

10 years agobreadcrumbs for members
Steve Sutton [Wed, 20 Aug 2014 16:39:18 +0000 (12:39 -0400)]
breadcrumbs for members

fix for breadcrumbs

10 years agoSpacing beneath Get Directions button event pages
Laury GvR [Wed, 20 Aug 2014 16:30:18 +0000 (12:30 -0400)]
Spacing beneath Get Directions button event pages

10 years ago.htaccess update since site has gone live
Laury Garcia van Rooijen [Wed, 20 Aug 2014 16:19:15 +0000 (12:19 -0400)]
.htaccess update since site has gone live

10 years agoMerge tag 'v1.0.6' into develop
Steve Sutton [Wed, 20 Aug 2014 16:04:00 +0000 (12:04 -0400)]
Merge tag 'v1.0.6' into develop

Version 1.0.6

10 years agoMerge branch 'hotfix/1.0.6' v1.0.6
Steve Sutton [Wed, 20 Aug 2014 16:03:52 +0000 (12:03 -0400)]
Merge branch 'hotfix/1.0.6'

10 years agoConsole log in js
Steve Sutton [Wed, 20 Aug 2014 16:03:20 +0000 (12:03 -0400)]
Console log in js

remove console log calls.

10 years agoMerge tag 'v1.0.5' into develop
Steve Sutton [Wed, 20 Aug 2014 15:46:37 +0000 (11:46 -0400)]
Merge tag 'v1.0.5' into develop

Version 1.0.5

10 years agoMerge branch 'hotfix/1.0.5' v1.0.5
Steve Sutton [Wed, 20 Aug 2014 15:46:27 +0000 (11:46 -0400)]
Merge branch 'hotfix/1.0.5'

10 years agosearch engine
Steve Sutton [Wed, 20 Aug 2014 15:46:14 +0000 (11:46 -0400)]
search engine

add  opensearchserver.ignore to navs footer

10 years agofix conflicts
Steve Sutton [Wed, 20 Aug 2014 15:29:23 +0000 (11:29 -0400)]
fix conflicts

10 years agoMerge branch 'hotfix/1.0.4' v1.0.4
Steve Sutton [Wed, 20 Aug 2014 15:28:51 +0000 (11:28 -0400)]
Merge branch 'hotfix/1.0.4'

10 years agoRefix profile page links
Steve Sutton [Wed, 20 Aug 2014 15:28:28 +0000 (11:28 -0400)]
Refix profile page links

for https

10 years agoFixing Member website links
Steve Sutton [Wed, 20 Aug 2014 15:22:56 +0000 (11:22 -0400)]
Fixing Member website links

Remove the external js file if they are on a member page.
Fix member urls so they can use https.

10 years agoFixing Member website links
Steve Sutton [Wed, 20 Aug 2014 15:22:56 +0000 (11:22 -0400)]
Fixing Member website links

Remove the external js file if they are on a member page.
Fix member urls so they can use https.

10 years agoMap marker search results.
Laury GvR [Wed, 20 Aug 2014 14:59:31 +0000 (10:59 -0400)]
Map marker search results.

It had been disabled due to our changes in getMemberSearchResults.
$memberMap = true in Member.php fixed it. Also formatting.

10 years agoMap marker search results.
Laury GvR [Wed, 20 Aug 2014 14:59:31 +0000 (10:59 -0400)]
Map marker search results.

It had been disabled due to our changes in getMemberSearchResults.
$memberMap = true in Member.php fixed it. Also formatting.

10 years agoUpdate bread crumb
Steve Sutton [Wed, 20 Aug 2014 14:45:22 +0000 (10:45 -0400)]
Update bread crumb

For search result pages need to
pick out catid= from referer

10 years agoMerge branch 'hotfix/1.0.1' v1.0.1
Steve Sutton [Wed, 20 Aug 2014 14:45:45 +0000 (10:45 -0400)]
Merge branch 'hotfix/1.0.1'

10 years agoUpdate bread crumb
Steve Sutton [Wed, 20 Aug 2014 14:45:22 +0000 (10:45 -0400)]
Update bread crumb

For search result pages need to
pick out catid= from referer

10 years agoMerge tag 'V1.0' into develop
Laury GvR [Wed, 20 Aug 2014 14:16:23 +0000 (10:16 -0400)]
Merge tag 'V1.0' into develop

Going live. V1.0

10 years agoMerge branch 'release/1.0' V1.0
Laury GvR [Wed, 20 Aug 2014 14:15:32 +0000 (10:15 -0400)]
Merge branch 'release/1.0'

10 years agoconfg server.ini
Steve Sutton [Wed, 20 Aug 2014 14:10:05 +0000 (10:10 -0400)]
confg server.ini

use ds4

10 years agoupdate member breadcrumbs
Steve Sutton [Wed, 20 Aug 2014 13:13:32 +0000 (09:13 -0400)]
update member breadcrumbs

clean up remove code comments.

10 years agoupdate member breadcrumbs
Steve Sutton [Wed, 20 Aug 2014 13:12:17 +0000 (09:12 -0400)]
update member breadcrumbs

add site-map if they come from the site map page.

10 years agoMinor style fix. Margin bottom of events h3.
Laury GvR [Wed, 20 Aug 2014 14:00:07 +0000 (10:00 -0400)]
Minor style fix. Margin bottom of events h3.

10 years agoMinor style corrections.
Laury GvR [Wed, 20 Aug 2014 13:49:24 +0000 (09:49 -0400)]
Minor style corrections.

10 years agoMore little edits, mostly styles
Laury GvR [Wed, 20 Aug 2014 13:48:28 +0000 (09:48 -0400)]
More little edits, mostly styles