Skip to content

Commit

Permalink
translated and refactored social media section; adjusted sidebar spac…
Browse files Browse the repository at this point in the history 
…ings and wp search button
  • Loading branch information
@following5
following5 committed Aug 8, 2013
1 parent 1c5b56d commit 71d2bc3
Show file tree
Hide file tree
Showing 17 changed files with 61 additions and 301 deletions.
26 changes: 13 additions & 13 deletions doc/license.txt
View file
Expand Up @@ -2,11 +2,11 @@
Opencaching Implementation Version 3


August 16, 2012
July 25, 2013

License Information

Copyright (C) 2006-2012 Opencaching Deutschland and Contributors
Copyright (C) 2006-2013 Opencaching Deutschland and Contributors

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -152,7 +152,7 @@ JavaScript libraries
URI : http://www.twinhelix.com/css/iepngfix/
License : LGPL 2.1

5. TinyMCE: JavaScript WYSIWYG Editor
5. TinyMCE JavaScript WYSIWYG Editor
Path : htdocs/resource2/tinymce/
URI : http://tinymce.moxiecode.com/
License : LGPL 2.1
Expand All @@ -166,54 +166,54 @@ Icons
URI : http://www.famfamfam.com/lab/icons/flags/
License : Public domain

OKAPI cache icons
2. OKAPI cache icons
Path : htdocs/resource2/ocstyle/images/map/caches2/
URI : http://code.google.com/p/opencaching-pl/source/browse/#svn%2Ftrunk%2Fokapi%2Fstatic%2Ftilemap
License : MIT

2. OpenIcons 'system-help' and 'preferences-other'
3. OpenIcons 'system-help' and 'preferences-other'
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/
URI : http://openiconlibrary.sourceforge.net/gallery2/?./Icons/categories/system-help-3.png
http://openiconlibrary.sourceforge.net/gallery2/?./Icons/categories/preferences-other-3.png
License : Creative Commons BY-SA 3.0
Author : Oxygen

3. 16x16 Icons 'flag-checker', 'footprints', 'clock select', lock
4. 16x16 Icons 'flag-checker', 'footprints', 'clock select', lock
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/map/caches2/
htdocs/resource2/ocstyle/images/cachestatus/
URI : http://www.softicons.com/free-icons/toolbar-icons/fugue-16px-additional-icons-2-by-yusuke-kamiyamane
License : Creative Commons BY 3.0
Author : Yusuke Kamiyamane

4. gears and gps-device icons, watched icon
5. gears and gps-device icons, watched icon
Path : htdocs/resource2/ocstyle/images/misc/
htdocs/resource2/ocstyle/images/viewcache/
URI : http://www.softicons.com/free-icons/toolbar-icons/fatcow-hosting-icons-by-fatcow/gear-in-icon
http://www.softicons.com/free-icons/web-icons/fatcow-hosting-additional-icons-by-fatcow/gps-handheld-icon
License : Creative Commons BY 3.0
Author : FatCow

5. checkmark icon
6. checkmark icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/web-icons/bremen-icons-by-pc.de/check-icon
License : Creative Commons BY 3.0
Author : PC.DE

6. search icon
7. search icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/toolbar-icons/24x24-free-pixel-icons-by-aha-soft/search-icon
License : Creative Commons BY-SA 3.0
Author : Aha-Soft

7. TinyMCE Icons
8. TinyMCE Icons
Path : htdocs/images/icons/
URI : http://tinymce.moxiecode.com/
License : LGPL 2.1
8. Social media icons (feed, google+, facebook, twitter)
Path : htdocs/resource2/ocstyle/images/misc/

9. Social media icons (feed, google+, facebook, twitter)
Path : htdocs/resource2/ocstyle/images/media/
URI : https://github.com/paulrobertlloyd/socialmediaicons
License : Creative Commons BY-SA 3.0
Autor : Paul Robert Lloyd (and other contributors)
Expand Down
255 changes: 0 additions & 255 deletions doc/license.txt~
View file

This file was deleted.

12 changes: 12 additions & 0 deletions htdocs/doc/sql/static-data/data.sql
View file
Expand Up @@ -2578,6 +2578,12 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2150', 'This ge
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2151', 'Also listed as', '2011-05-20 23:48:29');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2152', 'Loading more log entries ...', '2011-05-20 23:48:29');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2153', 'Auto-load log entries', '2011-05-20 23:48:29');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2155', 'Social media', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2156', 'Follow us:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2157', 'Join discussions:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2158', 'Opencaching Forum', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2159', 'Google+ Community', '2013-08-07 18:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2160', 'Facebook Group', '2013-08-07 18:30:00');

-- Table sys_trans_ref
SET NAMES 'utf8';
Expand Down Expand Up @@ -6609,6 +6615,12 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2151', 'DE', 'Auch gelistet als', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2152', 'DE', 'Lade weitere Logeinträge ...', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2153', 'DE', 'Logeinträge automatisch nachladen', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2155', 'DE', 'Soziale Medien', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2156', 'DE', 'Folge uns:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2157', 'DE', 'Diskutiere mit:', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2158', 'DE', 'Opencaching-Forum', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2159', 'DE', 'Google+ Community', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2160', 'DE', 'Facebook-Gruppe', '2013-08-07 18:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');
Expand Down

0 comments on commit 71d2bc3

Please sign in to comment.