repo
string
commit
string
message
string
diff
string
blueyed/dotfiles
da7b3f0c389e6e58819f1d104e7d17c404a63248
vimrc: add missing s:systemlist
diff --git a/vimrc b/vimrc index 0309cd6..cd52ad1 100644 --- a/vimrc +++ b/vimrc @@ -1365,1024 +1365,1032 @@ endif endif " Local dirs"{{{1 set backupdir=~/.local/share/vim/backups if ! isdirectory(expand(&backupdir)) call mkdir( &backupdir, 'p', 0700 ) endif if 1 let s:xdg_cache_home = $XDG_CACHE_HOME if !...
blueyed/dotfiles
c952c671a1728c144b5d69268c06cea51157079c
Add terminfo/x/xterm-kitty
diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty new file mode 100644 index 0000000..08d300e Binary files /dev/null and b/terminfo/x/xterm-kitty differ
blueyed/dotfiles
abe59a331eb0aeebccba55516ffbf885c577e8c6
Add timeit-shell
diff --git a/usr/bin/timeit-shell b/usr/bin/timeit-shell new file mode 100755 index 0000000..4b55ab8 --- /dev/null +++ b/usr/bin/timeit-shell @@ -0,0 +1,15 @@ +#!/usr/bin/python + +""" +Wrapper around Python's timeit to time a shell command. +""" + +import sys +import timeit + +timeit.main([ + '--setup', 'import sub...
blueyed/dotfiles
672e8b6a63b9bbc75a690f1bb061ebb129da88c6
vim: move gitcommit setup to ftplugin
diff --git a/usr/bin/vim-for-git b/usr/bin/vim-for-git deleted file mode 100755 index bf35ada..0000000 --- a/usr/bin/vim-for-git +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Wrapper meant to be set for GIT_EDITOR. -# This sets up the editor for git commit messages: -# It scrolls to "Changes" in the buffer, splits t...
blueyed/dotfiles
0e6518e28f2931f94d39dec1d3f91d4e3a7923f7
git: use EDITOR
diff --git a/config/git/config b/config/git/config index ba1d40b..6cb555c 100644 --- a/config/git/config +++ b/config/git/config @@ -1,218 +1,216 @@ # vim: ft=gitconfig [user] name = Daniel Hahler email = git@thequod.de [init] templatedir = ~/.config/git/template [alias] # NOTE: I am using full aliases for ...
blueyed/dotfiles
2cc6e23db5393cb7dda2cbd7467d26611e5260f8
ctags: look for local .ctags files
diff --git a/ctags b/ctags index f07efae..9cf3e7c 100644 --- a/ctags +++ b/ctags @@ -1,26 +1,30 @@ --fields=+ln --c-kinds=+p --c++-kinds=+p # Python: v are class members?! l are local vars. (with universal-ctags) # --python-kinds=-iv --langmap=php:.engine.inc.module.theme.install.php.php3.php4.php5.phtml --lan...
blueyed/dotfiles
eaa4f4e8ee2768b421d13cca6fdc911efec77c8f
Fix usr/bin/open-in-running-browser
diff --git a/usr/bin/open-in-running-browser b/usr/bin/open-in-running-browser index 8c4f56f..b8bdeee 100755 --- a/usr/bin/open-in-running-browser +++ b/usr/bin/open-in-running-browser @@ -1,32 +1,32 @@ #!/bin/sh # Pass through all arguments to the first running program from a list. # Fall back to $default. # # ...
blueyed/dotfiles
04bdaef34de6a4c1d86ff3e84c69ac2d8ce85bc0
usr/bin/sh-setup-x-theme: rename var for config file
diff --git a/usr/bin/sh-setup-x-theme b/usr/bin/sh-setup-x-theme index 8b3fee7..6587fa8 100755 --- a/usr/bin/sh-setup-x-theme +++ b/usr/bin/sh-setup-x-theme @@ -1,268 +1,268 @@ #!/bin/sh # # Change X/xrdb theme between light/dark (solarized). # # This script's output is meant to be eval'd. # It is used from my Zs...
blueyed/dotfiles
18ae76e74c4b0c419444b975b0237001f6259db1
revisit get-daytime-period (shellcheck, hide waiting msg)
diff --git a/usr/bin/get-daytime-period b/usr/bin/get-daytime-period index fb97b37..7c999c0 100755 --- a/usr/bin/get-daytime-period +++ b/usr/bin/get-daytime-period @@ -1,90 +1,90 @@ #!/bin/sh # # Get/print the daytime period ("Night", "Day), possibly from redshift # ("Night" / "Daytime" / "Transition"). # # This...
blueyed/dotfiles
8e831404ace21c4f7a474b7a873c8813c950403e
usr/bin/mktmpenv: use venv options
diff --git a/usr/bin/mktmpenv b/usr/bin/mktmpenv index e26b5b6..aabe3be 100755 --- a/usr/bin/mktmpenv +++ b/usr/bin/mktmpenv @@ -1,42 +1,43 @@ #!/bin/sh set -e # set -x # Make sure pyenv and pyenv-virtualenv is setup. eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" venv_options= while [ "${1#-}" ...
blueyed/dotfiles
ea17941941c26505575a62ad6c6232e40aeb4922
vimrc: update ShortenPath
diff --git a/vimrc b/vimrc index 790ab31..5bb2453 100644 --- a/vimrc +++ b/vimrc @@ -1286,1051 +1286,1057 @@ let g:cursorcross_no_map_CR = 1 let g:cursorcross_no_map_BS = 1 let g:delimitMate_expand_cr = 0 let g:SuperTabCrMapping = 0 " Skip SuperTab CR map setup (skipped anyway for expr mapping) let g:cursorcross...
blueyed/dotfiles
d42e5b7da0c6f1225e9338195fafc0d13274d4b0
vim: add vim/after/ftplugin/qf.vim
diff --git a/vim/after/ftplugin/qf.vim b/vim/after/ftplugin/qf.vim new file mode 100644 index 0000000..b2d9325 --- /dev/null +++ b/vim/after/ftplugin/qf.vim @@ -0,0 +1,114 @@ +" Generic wrapper, should replace s:MyQuickfixCR +function! s:with_equalalways(cmd) + try + let winid = win_getid() + catch + let winid ...
blueyed/dotfiles
82fd24e45a6edfbd7117b6d6a0d5fd1b45bb9de2
vimrc: rename QuitIfOnlyControlWinLeft, use nested
diff --git a/vimrc b/vimrc index 282176f..790ab31 100644 --- a/vimrc +++ b/vimrc @@ -2349,1042 +2349,1043 @@ omap S <Plug>Sneak_S let g:sneak#streak=2 let g:sneak#s_next = 1 " clever-s let g:sneak#target_labels = "sfjktunbqz/SFKGHLTUNBRMQZ?" " Replace 'f' with inclusive 1-char Sneak. nmap f <Plug>Sneak_f nmap ...
blueyed/dotfiles
dee0365d77605d9f42039e369efbea47d5c0d43d
tmux: improve select-pane mappings
diff --git a/tmux.conf b/tmux.conf index c9ef9ac..5d79123 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,212 +1,212 @@ # This file holds common settings between tmux and byobu-tmux. # It gets sourced by ~/.tmux.conf and ~/.byobu/.tmux.conf. # # TODO: select windows using alt-NR (again)?! - but used in Vim, too. # ...
blueyed/dotfiles
a4785b07c6bdf8c931084ce162e18d5e14f1c560
vimrc: update/sync
diff --git a/vimrc b/vimrc index e67de60..282176f 100644 --- a/vimrc +++ b/vimrc @@ -1,543 +1,557 @@ +" NOTE: this is not in sync currently with my local config currently. +" E.g. I am using vim-plug since a while since Neobundle. scriptencoding utf-8 +" Hack for left-over Vader Log commands. +com! -nargs=+ Lo...
blueyed/dotfiles
25a3c93227cfe67d0b495627c9c1eac3e2f9aa19
vimrc: fixup: remove echom
diff --git a/vimrc b/vimrc index 855a654..e67de60 100644 --- a/vimrc +++ b/vimrc @@ -3218,788 +3218,788 @@ let NERDTreeIgnore += ['__pycache__', '.ropeproject'] " nnoremap j gj " nnoremap k gk nnoremap <Down> gj nnoremap <Up> gk " inoremap <Down> <C-o>gj " inoremap <Up> <C-o>gk " XXX: does not keep virtual colum...
blueyed/dotfiles
f4a4e35f29caf1341b613b1043b6279cf3bae4f4
vimrc: improve BufNewFile handler for unreadable files
diff --git a/vimrc b/vimrc index 9338656..855a654 100644 --- a/vimrc +++ b/vimrc @@ -3215,779 +3215,791 @@ let NERDTreeIgnore += ['__pycache__', '.ropeproject'] " inoremap <Down> <C-O>:normal gj<CR> " " j,k move by screen line instead of file line. " nnoremap j gj " nnoremap k gk nnoremap <Down> gj nnoremap <Up>...
blueyed/dotfiles
efa2c894137c7d17b4f8215b85286327296f559f
Add config/python/pythonrc.py
diff --git a/config/python/pythonrc.py b/config/python/pythonrc.py new file mode 100644 index 0000000..24ea2fa --- /dev/null +++ b/config/python/pythonrc.py @@ -0,0 +1,60 @@ +""" +Used as PYTHONSTARTUP file. + +Based on the example in Doc/library/readline.rst. + +# The default behavior is enable tab-completion and to u...
praekelt/django-googlesearch
12a77b9f391e472a1a2c8dbefc348bdcceece806
Amend licence to Consulting
diff --git a/LICENSE b/LICENSE index a429a1f..bce1513 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,24 @@ -Copyright (c) Praekelt Foundation +Copyright (c) Praekelt Consulting All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the foll...
praekelt/django-googlesearch
fa21c4a23aceab4d3b1b69fba6f73cc741c9d47e
Prep for release
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 79fbc94..28f0bd6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,20 +1,24 @@ Changelog ========= +0.2 +--- +#. Django 1.6 compatibility. + 0.1.2 ----- #. Refer to correct template tag in help text. Thanks grafyte. 0.1 --- #. Refactor to use a linked cust...
praekelt/django-googlesearch
36f4e79818a76de45a6ffe7a7d947a73f3dc2000
Fix urls
diff --git a/googlesearch/urls.py b/googlesearch/urls.py index 5c69f86..39a56f8 100644 --- a/googlesearch/urls.py +++ b/googlesearch/urls.py @@ -1,19 +1,20 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url +from django.views.generic.base import TemplateView + urlpatt...
praekelt/django-googlesearch
01b5dc65c36a93be5f8cd8fd014d39dc53d0a4a0
Prep for release
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 99c2794..79fbc94 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,20 +1,20 @@ Changelog ========= -0.1.1 +0.1.2 ----- #. Refer to correct template tag in help text. Thanks grafyte. 0.1 --- #. Refactor to use a linked custom search engine as described at ht...
praekelt/django-googlesearch
9d363edca19a7db281f5463b3f28235eb24dfb7e
Prep for release
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2627c83..99c2794 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,20 +1,20 @@ Changelog ========= -next ----- +0.1.1 +----- #. Refer to correct template tag in help text. Thanks grafyte. 0.1 --- #. Refactor to use a linked custom search engine as described ...
praekelt/django-googlesearch
991c3df69e2084dda886bcd1dc328a7d59fdb380
Refer to correct template tag
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7646796..2627c83 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,16 +1,20 @@ Changelog ========= +next +---- +#. Refer to correct template tag in help text. Thanks grafyte. + 0.1 --- #. Refactor to use a linked custom search engine as described at http://www....
praekelt/django-googlesearch
0d599a6521eb288c8af7861dab48432690d7eadc
Prep for release
diff --git a/setup.py b/setup.py index 0be4513..6d3f5fe 100644 --- a/setup.py +++ b/setup.py @@ -1,31 +1,31 @@ from setuptools import setup, find_packages setup( name='django-googlesearch', version='0.1', description='Django Google linked custom search engine app.', long_description = open('READ...
praekelt/django-googlesearch
6e45b03fdb0e09d9a7209aeaba527a95b9f6de3f
Prep for release
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 639d8b8..7646796 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,16 +1,16 @@ Changelog ========= -next ----- +0.1 +--- #. Refactor to use a linked custom search engine as described at http://www.google.com/cse/docs/cref.html. 0.0.6 ----- #. Packaging and t...
praekelt/django-googlesearch
662aeed3175e0f97304dd622993a7558171841fb
Clean up xml
diff --git a/googlesearch/templates/googlesearch/cref_cse.xml b/googlesearch/templates/googlesearch/cref_cse.xml index 26a4fd5..d5659f2 100644 --- a/googlesearch/templates/googlesearch/cref_cse.xml +++ b/googlesearch/templates/googlesearch/cref_cse.xml @@ -1,27 +1,26 @@ <?xml version="1.0" encoding="UTF-8" ?> <Google...
praekelt/django-googlesearch
be8fab03eed9363652efd1c7eca7da863c0a028b
Refactor to use a linked custom search engine
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8811c47..639d8b8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,12 +1,16 @@ Changelog ========= +next +---- +#. Refactor to use a linked custom search engine as described at http://www.google.com/cse/docs/cref.html. + 0.0.6 ----- #. Packaging and test setup ...
praekelt/django-googlesearch
99156e53c7f2cefe400e6e50891103ff7e2d48eb
Refactor to use linked CSE
diff --git a/googlesearch/templates/googlesearch/cref_cse.xml b/googlesearch/templates/googlesearch/cref_cse.xml new file mode 100644 index 0000000..36fc976 --- /dev/null +++ b/googlesearch/templates/googlesearch/cref_cse.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<GoogleCustomizations> + <Custom...
praekelt/django-googlesearch
f775d2ecee56958e43610bcfa85ba090cff3dd84
Prep for release
diff --git a/AUTHORS.rst b/AUTHORS.rst index 53f9b3c..9a5b5bb 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,7 +1,8 @@ Authors ======= Praekelt Foundation ------------------- * Shaun Sephton +* Hedley Roos diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6cb77bd..8811c47 100644 --- a/CHANGELOG.rst +++ b/CHAN...
praekelt/django-googlesearch
e5224bb40ff4869f11e106e60faa63634a1ddf15
Fixing template tags' inclusion template names/paths.
diff --git a/googlesearch/templatetags/googlesearch_inclusion_tags.py b/googlesearch/templatetags/googlesearch_inclusion_tags.py index 145b369..4184d64 100644 --- a/googlesearch/templatetags/googlesearch_inclusion_tags.py +++ b/googlesearch/templatetags/googlesearch_inclusion_tags.py @@ -1,19 +1,17 @@ from django impo...
praekelt/django-googlesearch
dc0173afd398758d547f6ace2f9517e4f032bd50
use latest setuptest
diff --git a/setup.py b/setup.py index 45546e0..e671cac 100644 --- a/setup.py +++ b/setup.py @@ -1,34 +1,28 @@ from setuptools import setup, find_packages -from setuptools.command.test import test - -def run_tests(self): - from setuptest.runtests import runtests - return runtests(self) -test.run_tests = run_test...
praekelt/django-googlesearch
e62562bd41120fe7cd2a0fed36c2c6e59f7a7907
added testrunner
diff --git a/googlesearch/models.py b/googlesearch/models.py new file mode 100644 index 0000000..e69de29 diff --git a/googlesearch/tests.py b/googlesearch/tests.py new file mode 100644 index 0000000..83f9709 --- /dev/null +++ b/googlesearch/tests.py @@ -0,0 +1,6 @@ +import unittest + + +class TestCase(unittest.TestCase...
praekelt/django-googlesearch
34b1a2d9834a6a23e80d51611b0e07d7a038a332
prepare v0.0.5 release
diff --git a/setup.py b/setup.py index 8906416..e30ca98 100644 --- a/setup.py +++ b/setup.py @@ -1,24 +1,24 @@ from setuptools import setup, find_packages setup( name='django-googlesearch', version='0.0.5', description='Django Google custom search engine app.', - long_description = open('README.rs...
praekelt/django-googlesearch
39b4544eed5b13fd15475df7dd7374181a96c198
prepare v0.0.5 release
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 1ea9e2b..0000000 --- a/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Praekelt Foundation -=================== -* Shaun Sephton diff --git a/AUTHORS.rst b/AUTHORS.rst new file mode 100644 index 0000000..53f9b3c --- /dev/null +++ b/AUTHORS.rst @@ -0,0 +1,7 @@ +Author...
praekelt/django-googlesearch
a269e1dd1be0769e984b907ea3b91efd1404ae11
request note
diff --git a/README.rst b/README.rst index 532950f..8174a0d 100644 --- a/README.rst +++ b/README.rst @@ -1,55 +1,57 @@ Django Google Search ==================== **Django Google custom search engine app.** Provides a simple tag rendering a Google Custom Search Engine input field and a view displaying search result...
praekelt/django-googlesearch
7be28cd9f513e8c9156d985c0c32b168d582d83b
doc byline
diff --git a/README.rst b/README.rst index a47faea..898c5bd 100644 --- a/README.rst +++ b/README.rst @@ -1,30 +1,32 @@ Django Google Search ==================== **Django Google custom search engine app.** +Provides a simple tag rendering a Google Custom Search Engine input field and a view displaying search result...
praekelt/django-googlesearch
c85986b535802aa02348858ea78f6776f0f35fe5
refactor to drop use of preferences
diff --git a/README.rst b/README.rst index fdd2633..a47faea 100644 --- a/README.rst +++ b/README.rst @@ -1,15 +1,30 @@ Django Google Search ==================== **Django Google custom search engine app.** .. contents:: Contents :depth: 5 Installation ------------ -#. Install ``django-preferences`` as d...
praekelt/django-googlesearch
98829d15856cad8a492723684ae9c43d5c97da67
started on docs
diff --git a/README.rst b/README.rst index e69de29..fdd2633 100644 --- a/README.rst +++ b/README.rst @@ -0,0 +1,15 @@ +Django Google Search +==================== +**Django Google custom search engine app.** + +.. contents:: Contents + :depth: 5 + +Installation +------------ + +#. Install ``django-preferences`` as de...
praekelt/django-googlesearch
1443782e5332aa56c2509270e9cc8af4e12bf089
version bump, not zip safe
diff --git a/setup.py b/setup.py index 2dafb84..51ed665 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,27 @@ from setuptools import setup, find_packages setup( name='django-googlesearch', - version='0.0.3', + version='0.0.4', description='Django Google custom search engine app.', long_descrip...
praekelt/django-googlesearch
e8cf1cf67d322611ce86c29f9aa0d285c2832e66
version bump
diff --git a/setup.py b/setup.py index 6c58cd8..2dafb84 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,26 @@ from setuptools import setup, find_packages setup( name='django-googlesearch', - version='0.0.2', + version='0.0.3', description='Django Google custom search engine app.', long_descrip...
praekelt/django-googlesearch
6eb877244833d43d34bd433f0d83f723ddf4fd0b
not override prefs
diff --git a/googlesearch/templates/googlesearch/inclusion_tags/googlesearch_input.html b/googlesearch/templates/googlesearch/inclusion_tags/googlesearch_input.html index 025460d..5e26f33 100644 --- a/googlesearch/templates/googlesearch/inclusion_tags/googlesearch_input.html +++ b/googlesearch/templates/googlesearch/in...
praekelt/django-googlesearch
05d7d5808b4e36a276922f40120e4fc82821f558
corrected includes
diff --git a/MANIFEST.in b/MANIFEST.in index 2b76c6b..66104d2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include AUTHORS include LICENSE include README.rst -recursive-include gallery/templates * -recursive-include gallery/templatetags * +recursive-include googlesearch/templates * +recursive-include g...
praekelt/django-googlesearch
af4132483bc764677c0e224b7ff0ddc38e5ab428
include templates
diff --git a/MANIFEST.in b/MANIFEST.in index 7c985df..2b76c6b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,5 @@ include AUTHORS include LICENSE include README.rst +recursive-include gallery/templates * +recursive-include gallery/templatetags *
praekelt/django-googlesearch
331c0c41ebf3eac1be99ebd3211d9ae7ecfed303
copy correction
diff --git a/LICENSE b/LICENSE index 438baa2..a429a1f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,24 @@ Copyright (c) Praekelt Foundation All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Re...
praekelt/django-googlesearch
dac625a393b0e5897145e92100d9c9654f90dc79
correct import
diff --git a/googlesearch/admin.py b/googlesearch/admin.py index b9396cc..3c7fe5b 100644 --- a/googlesearch/admin.py +++ b/googlesearch/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from googlesearch.models import GoogleSearchOptions +from googlesearch.models import GoogleSearchPreferences -admin.site...
praekelt/django-googlesearch
c209fb7102d632fa9e0cfc28feee806c65484006
remed Jono
diff --git a/AUTHORS b/AUTHORS index 21e79f4..1ea9e2b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,3 @@ Praekelt Foundation =================== * Shaun Sephton -* Jonathan Bydendyk
praekelt/django-googlesearch
d0404a23bd9a6e20387b71cb2ec48e5069c64b54
version bump
diff --git a/setup.py b/setup.py index 2b6ce93..6c58cd8 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,26 @@ from setuptools import setup, find_packages setup( name='django-googlesearch', - version='0.0.1', + version='0.0.2', description='Django Google custom search engine app.', long_descrip...
praekelt/django-googlesearch
dc8496e468de3ca4340ba13893b579d20e2f4ac4
preferences rename
diff --git a/googlesearch/models.py b/googlesearch/models.py index 44136c7..f5cd347 100644 --- a/googlesearch/models.py +++ b/googlesearch/models.py @@ -1,17 +1,17 @@ from django.db import models -from options.models import Options +from preferences.models import Preferences -class GoogleSearchOptions(Options): - ...
praekelt/django-googlesearch
c145d484149e39350eefe9e1bb13046b163c4437
polish
diff --git a/setup.py b/setup.py index 4dfcd43..b8a5142 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,23 @@ from setuptools import setup, find_packages setup( name='django-googlesearch', - version='dev', + version='0.0.1', description='Django Google custom search engine app.', - author='Praeke...
Aequilibrium/GSMS
0575ed4f0f09ec828d9dd696e06ca4fbfb13a003
Loop update
diff --git a/gsms.kdevelop.pcs b/gsms.kdevelop.pcs index 1404f7e..0699672 100644 Binary files a/gsms.kdevelop.pcs and b/gsms.kdevelop.pcs differ diff --git a/gsms.kdevses b/gsms.kdevses index c3a94e2..711cf16 100644 --- a/gsms.kdevses +++ b/gsms.kdevses @@ -1,49 +1,55 @@ <?xml version = '1.0' encoding = 'UTF-8'?> <!D...
Aequilibrium/GSMS
492eede9c6f67b29472051bc81172bc6c6a539a3
Deterred beamOn implemented
diff --git a/src/action/RunAction.cpp b/src/action/RunAction.cpp index 9d445f0..8834867 100644 --- a/src/action/RunAction.cpp +++ b/src/action/RunAction.cpp @@ -1,66 +1,70 @@ /*************************************************************************** * Copyright (C) 2009 by P.Voylov ...
Aequilibrium/GSMS
d0e7a8dc64a9e57f2e0d6365cd179e1501b87189
Minor header changes
diff --git a/src/action/EventAction.cpp b/src/action/EventAction.cpp index 512913a..39019e1 100644 --- a/src/action/EventAction.cpp +++ b/src/action/EventAction.cpp @@ -1,78 +1,85 @@ -// -// C++ Implementation: EventAction -// -// Description: -// -// -// Author: P.Voylov <pvoilov@aidoss.com>, (C) 2009 -// -// Copyrig...
vim-scripts/Projmgr
5215e0926b9b191cb7ef8aaff488849af43d87db
Version 0.2
diff --git a/doc/Projmgr.txt b/doc/Projmgr.txt index 658a612..5c0679e 100644 --- a/doc/Projmgr.txt +++ b/doc/Projmgr.txt @@ -1,38 +1,52 @@ *Projmgr.txt* Plugin for loading/unloading/switching Vim sessions This plugin provides a more easy to use interface for the Vim session feature. I wrote it first only for my...
vim-scripts/Projmgr
6cfa72ad8dd013fcf9a2a33d6ad610559ff3d448
Version 0.1: Initial upload
diff --git a/README b/README new file mode 100644 index 0000000..9c1f5bd --- /dev/null +++ b/README @@ -0,0 +1,20 @@ +This is a mirror of http://www.vim.org/scripts/script.php?script_id=279 + +This plugin provides a more easy to use interface for the Vim session +feature. + +I wrote it first only for my own needs. I ha...
jcbozonier/Sinatra-and-DataMapper-Sample-App
a027a40c47379d18392254d71d965e2bb8832ef1
finished sinatra/datamapper sample blog app
diff --git a/datamapper_test.rb b/datamapper_test.rb new file mode 100644 index 0000000..bc5f16f --- /dev/null +++ b/datamapper_test.rb @@ -0,0 +1,37 @@ +require 'sinatra' +require 'DataMapper' + +DataMapper::setup(:default, "sqlite3://#{Dir.pwd}/blog.db") + +class Post + include DataMapper::Resource + pro...
cj/sd-ci-api
565e330e0c3bd2137087ebb778bf72612f78f3b5
added a few things plus mailer
diff --git a/system/application/config/constants.template.php b/system/application/config/constants.template.php index e616b40..64e92c8 100644 --- a/system/application/config/constants.template.php +++ b/system/application/config/constants.template.php @@ -1,52 +1,67 @@ <?php if ( ! defined('BASEPATH')) exit('No dire...
cj/sd-ci-api
6fc3deea11577d30664eab3f83435158e634ec25
added MY_Controller which REST_Controller extends from so you can easily customize the core functions
diff --git a/system/application/libraries/MY_Controller.php b/system/application/libraries/MY_Controller.php new file mode 100644 index 0000000..f24391e --- /dev/null +++ b/system/application/libraries/MY_Controller.php @@ -0,0 +1,121 @@ +<?php + +class MY_Controller extends Controller +{ + + function __construct() +...
cj/sd-ci-api
af837b77fc625af7b9b84d4e70f3deaec958cbae
cleaned up a bunch of files
diff --git a/.htaccess b/.htaccess index 65271f1..395ea81 100644 --- a/.htaccess +++ b/.htaccess @@ -1,37 +1,35 @@ -# @author Adam Nazar -# @since Version 1.0 <IfModule mod_rewrite.c> RewriteEngine On - + #git hub test #this is to remove the index.php in url #RewriteCond $1 !^(index\.php...
leth/SpecGen
5238b20e4942a372ba43a32eef4bb7c287dade41
improved domain/range output text based on Bio vocab explanations. added css output for archaic terms.
diff --git a/libvocab.py b/libvocab.py index ee45192..7bedee0 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,843 +1,857 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
f7e76c1f3fad97dae77c8564818fb6e373be02ea
tidying
diff --git a/myfoaf.sh b/myfoaf.sh index 797a0f6..8f05900 100755 --- a/myfoaf.sh +++ b/myfoaf.sh @@ -1,17 +1,20 @@ #!/bin/sh # this assumes template.html in main dir, and drops a _tmp... file into that dir as a candidate index.html # also assumes http://svn.foaf-project.org/foaf/trunk/xmlns.com/ checked out in par...
leth/SpecGen
0bd0e506bdade4692ecb7984b71ee25654216485
Improved replacement logic.
diff --git a/libvocab.py b/libvocab.py index 031d27c..d5ee602 100755 --- a/libvocab.py +++ b/libvocab.py @@ -348,550 +348,548 @@ class Vocab(object): self.terms.append(p) if (not str(p) in tmpproperties): tmpproperties.append(str(p)) self.properties.append(p) # sel...
leth/SpecGen
078594f5210e36c36931f4317476a42884317281
Adding equivalences.
diff --git a/libvocab.py b/libvocab.py index abedba5..031d27c 100755 --- a/libvocab.py +++ b/libvocab.py @@ -136,735 +136,762 @@ class Term(object): def __str__(self): try: s = self.id except NameError: self.label = None speclog('No label for '+self+' todo: take from uri regex') ...
leth/SpecGen
3ecd7221c123f131d9ca16d0c2aa7da6d2a110f3
Check both directions for disjoint classes.
diff --git a/libvocab.py b/libvocab.py index 66c3322..abedba5 100755 --- a/libvocab.py +++ b/libvocab.py @@ -118,747 +118,753 @@ class Term(object): return s def id(self): print "trying id" try: s = self.id except NameError: self.id = None s = '[NOID]' speclog('No ID...
leth/SpecGen
171f89366cb9a7c330f6bf25cec067814aff1189
Removing misleading version number.
diff --git a/README.TXT b/README.TXT index d7ca23c..30fe2d1 100644 --- a/README.TXT +++ b/README.TXT @@ -1,95 +1,95 @@ This is an experimental new codebase for specgen tools. -It depends utterly upon rdflib. See http://rdflib.net/2.4.0/ +It depends utterly upon rdflib. See http://rdflib.net/ If you're lucky, typi...
leth/SpecGen
4887f1b55e2291220aa2a10701c9fa3d7b6619e5
Fixed newlines in comments and labels.
diff --git a/libvocab.py b/libvocab.py index 7e74ca5..66c3322 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,859 +1,859 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
5e79252bc905c261757a4729881caa860a33f63b
Added some more vocabulary prefix entries.
diff --git a/libvocab.py b/libvocab.py index 9ed667e..7e74ca5 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,754 +1,758 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
08fcad5fb525f94ca795e008d6e77711b77d1cfa
Implemented Term.is_external(vocab)
diff --git a/libvocab.py b/libvocab.py index b8ae12c..9ed667e 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,644 +1,643 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
514bdc0ab7b4c4a0073192778436f0e6731ba1b0
Added include directives to documentation files
diff --git a/libvocab.py b/libvocab.py index a67c75a..b8ae12c 100755 --- a/libvocab.py +++ b/libvocab.py @@ -151,696 +151,711 @@ class Term(object): return (s+str(self)) def simple_report(self): t = self s='' s += "default: \t\t"+t +"\n" s += "id: \t\t"+t.id +"\n" s += "uri: ...
leth/SpecGen
6a3846886e2ce33ff47dc79717673d6f07896923
Made the documentation termlinking un-foaf-specific.
diff --git a/libvocab.py b/libvocab.py index ee45192..a67c75a 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,843 +1,846 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
0ec68466bf9ee83cd7df9da3fc047f94496010f6
Removing old code.
diff --git a/old/specgen4b.py b/old/specgen4b.py deleted file mode 100755 index 1415763..0000000 --- a/old/specgen4b.py +++ /dev/null @@ -1,590 +0,0 @@ -#!/usr/bin/env python2.5 - - -# -# SpecGen code adapted to be independent of a particular vocabulary (e.g., FOAF) -# <http://sw.deri.org/svn/sw/2005/08/sioc/ontology/...
leth/SpecGen
c20e3e0982255b102cfc27a92c9242e0b2b2224a
Automatic CRLF to LF conversion.
diff --git a/examples/sioc/sioc.rdf b/examples/sioc/sioc.rdf index 411015f..5a34b30 100644 --- a/examples/sioc/sioc.rdf +++ b/examples/sioc/sioc.rdf @@ -1,720 +1,720 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<rdf:RDF - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:rdfs="http://www.w3.org/200...
leth/SpecGen
efd2e8ce26f11f82ccfade2dfac553217476965a
This was only ever a temporary place for the weighted interests vocab so I've deleted the text and pointed at the notube git
diff --git a/examples/weighted-interests/_tmp_spec.html b/examples/weighted-interests/_tmp_spec.html index 7caffed..453e107 100644 --- a/examples/weighted-interests/_tmp_spec.html +++ b/examples/weighted-interests/_tmp_spec.html @@ -1,523 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//...
leth/SpecGen
211043311ef320f99e3574825bd1b4ecb1d365bc
fixed a bug whereby if there was no term.status the terms were not included in the full list
diff --git a/examples/weighted-interests/create_dot_file.rb b/create_dot_file.rb similarity index 90% rename from examples/weighted-interests/create_dot_file.rb rename to create_dot_file.rb index 217ba7e..db68cdf 100644 --- a/examples/weighted-interests/create_dot_file.rb +++ b/create_dot_file.rb @@ -1,348 +1,359 @@ r...
leth/SpecGen
7672a6776bb779287676fd3d32b143ff743644d6
status
diff --git a/libvocab.py b/libvocab.py index 023c5e8..04a0ae5 100755 --- a/libvocab.py +++ b/libvocab.py @@ -3,830 +3,830 @@ # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = Vocab( f='examples/foaf/i...
leth/SpecGen
4ce171f4f554223f14db935e4a5bc7b96f80641b
removed uris for statuses
diff --git a/libvocab.py b/libvocab.py index fc2d5d9..91aa2dc 100755 --- a/libvocab.py +++ b/libvocab.py @@ -150,683 +150,683 @@ class Term(object): def simple_report(self): t = self s='' s += "default: \t\t"+t +"\n" s += "id: \t\t"+t.id +"\n" s += "uri: \t\t"+t.uri +"\n" s...
leth/SpecGen
b6ce59ee4555f1f8d50532e4861511fb7402d488
removed uris for statuses
diff --git a/libvocab.py b/libvocab.py index 588399e..fc2d5d9 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,828 +1,832 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
3130dbf10c1026e84e5864c2afa1b49aeb21fb08
libvocab tweaks; adding wiki link and using term ids not labels
diff --git a/libvocab.py b/libvocab.py index 7c42d68..588399e 100755 --- a/libvocab.py +++ b/libvocab.py @@ -4,820 +4,825 @@ # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = Vocab( f='examples/foaf/index.rdf', uri='http://xmln...
leth/SpecGen
14226e9e37dd81c86a4f1b25a718e85295f1008e
utility
diff --git a/myfoaf.sh b/myfoaf.sh new file mode 100755 index 0000000..bdaa40e --- /dev/null +++ b/myfoaf.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# this assumes template.html in main dir, and drops a _tmp... file into that dir as a candidate index.html +# also assumes http://svn.foaf-project.org/foaf/trunk/xmlns.com/ checked...
leth/SpecGen
fcb31cd371327c257f4bcf94ecc1b4c69a45b355
added a draft RDF/XML version of atom activties along witha few textual changes and notes
diff --git a/examples/activ-atom/Activity_Streams_Ontology.zip b/examples/activ-atom/Activity_Streams_Ontology.zip new file mode 100644 index 0000000..67368b0 Binary files /dev/null and b/examples/activ-atom/Activity_Streams_Ontology.zip differ diff --git a/examples/activ-atom/_tmp_spec.html b/examples/activ-atom/_tmp_...
leth/SpecGen
9d27872822063ed7bfb4598e01f976df5ccbc4ec
a note to say what it is and that it's a draft
diff --git a/examples/weighted-interests/_tmp_spec.html b/examples/weighted-interests/_tmp_spec.html index 3dcc4d6..c3d2aec 100644 --- a/examples/weighted-interests/_tmp_spec.html +++ b/examples/weighted-interests/_tmp_spec.html @@ -1,479 +1,481 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html PUBLIC "-//W3C...
leth/SpecGen
6072ae79114a3534d5d0753b1dbf5d87cd32e489
a very drafty schema for weighted interests
diff --git a/examples/weighted-interests/_tmp_spec.html b/examples/weighted-interests/_tmp_spec.html new file mode 100644 index 0000000..3dcc4d6 --- /dev/null +++ b/examples/weighted-interests/_tmp_spec.html @@ -0,0 +1,479 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//E...
leth/SpecGen
1cf201baf8f1376dfa153eee4f847c5385b5b7d5
swapped round unstable and testing as per the spec
diff --git a/libvocab.py b/libvocab.py index 1519aa3..756cc2b 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,837 +1,837 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
0d5f6ccfae6c6c7030d7347682406fd0abf37c9e
changed so that terms are ordered by stability
diff --git a/libvocab.py b/libvocab.py index 334e580..1519aa3 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,797 +1,837 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
2cd9b3988927222ad70117e888997c58de0f342c
changes in range of and in domain of - better wording
diff --git a/libvocab.py b/libvocab.py index 494fd58..334e580 100755 --- a/libvocab.py +++ b/libvocab.py @@ -24,774 +24,774 @@ # http://www.daniweb.com/code/snippet354.html # http://docs.python.org/reference/datamodel.html#specialnames # # RDFlib: # http://www.science.uva.nl/research/air/wiki/RDFlib # # http://d...
leth/SpecGen
c890ed20fe19549660ee61abc7e7c1a75a6ed181
fixed validation problems with spec
diff --git a/libvocab.py b/libvocab.py index 6922291..494fd58 100755 --- a/libvocab.py +++ b/libvocab.py @@ -64,734 +64,734 @@ import operator bindings = { u"xfn": XFN, u"rdf": RDF, u"rdfs": RDFS, u"vs": VS } #g = None def speclog(str): sys.stderr.write("LOG: "+str+"\n") # todo: shouldn't be foaf specifi...
leth/SpecGen
35aa5b462567b4d4ee76dbbec90d4473d7e69de2
added back the regex that links up foaf terms
diff --git a/libvocab.py b/libvocab.py index f74e129..6922291 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,791 +1,797 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
0f110f3626a3a8d3a6958cb546843d7fc17335e3
adding back the first a-z list
diff --git a/libvocab.py b/libvocab.py index 9988c60..f74e129 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,791 +1,791 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
03a210e7dc51989385f73ca918f0871fb23bf13c
removed more stupid variable names
diff --git a/libvocab.py b/libvocab.py index c4e1759..9988c60 100755 --- a/libvocab.py +++ b/libvocab.py @@ -128,665 +128,664 @@ class Term(object): print "Comparing property URI ",self.uri," with vocab uri: " + vocab.uri return(False) #def __repr__(self): # return(self.__str__) def __str__(self...
leth/SpecGen
558e47c02d9e7ee0edc8bed5542d93a0c342d92e
a bit more of a cleanup of variable names
diff --git a/libvocab.py b/libvocab.py index c31dc7e..c4e1759 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,797 +1,792 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
f46870fdd715a64df2bf0cbc922bc62f76c5ab04
removed all 'foo' variables to make themn more descriptive
diff --git a/libvocab.py b/libvocab.py index 84409a9..c31dc7e 100755 --- a/libvocab.py +++ b/libvocab.py @@ -14,788 +14,784 @@ # >>> dna.comment # 'A checksum for the DNA of some thing. Joke.' # >>> dna.id # u'dnaChecksum' # >>> dna.uri # 'http://xmlns.com/foaf/0.1/dnaChecksum' # # # Python OO note...
leth/SpecGen
b32449956d805ef501662c383b7250f8a265e1b2
yet more arguments - you can now specify twhere the teplate and index.rdf files are separately. it looks for the docs in indir and looks there index.rdf and template if those args are ommitted
diff --git a/libvocab.py b/libvocab.py index de47b2a..84409a9 100755 --- a/libvocab.py +++ b/libvocab.py @@ -1,800 +1,801 @@ #!/usr/bin/env python # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = ...
leth/SpecGen
ffe61508d3fe88231cd6731b9307756eac856e62
You can now set outfile and outdir in the options
diff --git a/specgen5.py b/specgen5.py index 64672bb..8114a92 100755 --- a/specgen5.py +++ b/specgen5.py @@ -1,212 +1,199 @@ #!/usr/bin/env python # This is a draft rewrite of specgen, the family of scripts (originally # in Ruby, then Python) that are used with the FOAF and SIOC RDF vocabularies. # This version i...
leth/SpecGen
8cb483f0adea09d253fee670b96e395f93d07f5c
Basic getops now used. No outfile or outdir yet
diff --git a/specgen5.py b/specgen5.py index 561884d..64672bb 100755 --- a/specgen5.py +++ b/specgen5.py @@ -1,139 +1,212 @@ #!/usr/bin/env python # This is a draft rewrite of specgen, the family of scripts (originally # in Ruby, then Python) that are used with the FOAF and SIOC RDF vocabularies. # This version i...
leth/SpecGen
7a1a3dfc07177b5d490237add4c52f1629e336df
rdfa rdfs:range element closed now
diff --git a/libvocab.py b/libvocab.py index 2ff7a8f..de47b2a 100755 --- a/libvocab.py +++ b/libvocab.py @@ -183,618 +183,618 @@ class Property(Term): # print "Property.is_property called on "+self return(True) def is_class(self): # print "Property.is_class called on "+self return(False) ...
leth/SpecGen
122d2b217351f4696ef9c2ba58eaf1b83e81da6f
utility shell script for foaf spec ns
diff --git a/updatelivefoaf.sh b/updatelivefoaf.sh new file mode 100644 index 0000000..e66ea20 --- /dev/null +++ b/updatelivefoaf.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# this assumes template.html in main dir, and drops a _tmp... file into that dir as a candidate index.html +# also assumes http://svn.foaf-project.org/foaf/t...
leth/SpecGen
1c0210ff7d400749a87d4ca99618960f48bae35d
turned off validation queries by default
diff --git a/libvocab.py b/libvocab.py index 1189dc2..327a25c 100755 --- a/libvocab.py +++ b/libvocab.py @@ -2,793 +2,795 @@ # total rewrite. --danbri # Usage: # # >>> from libvocab import Vocab, Term, Class, Property # # >>> from libvocab import Vocab, Term, Class, Property # >>> v = Vocab( f='examples/foaf...
leth/SpecGen
8a6d24b05d245d075aa739f792103c32d120064a
notes on using it for xmlns.com foaf stuff
diff --git a/foafsite-readme.txt b/foafsite-readme.txt new file mode 100644 index 0000000..1203ce7 --- /dev/null +++ b/foafsite-readme.txt @@ -0,0 +1,43 @@ +TODO before we can use it for real + +* get rid of 'validation queries' link by default +* read opts from commandline +* use same css as http://xmlns.com/foaf/spec...
leth/SpecGen
84033d24a6ef14bb7a8921bd90bc8a4b1a099165
notes on lib installer
diff --git a/README.TXT b/README.TXT index be64e8c..d7ca23c 100644 --- a/README.TXT +++ b/README.TXT @@ -1,88 +1,95 @@ This is an experimental new codebase for specgen tools. It depends utterly upon rdflib. See http://rdflib.net/2.4.0/ If you're lucky, typing this is enough: easy_install -U rdflib==2.4.0 ...
leth/SpecGen
a31df6b33c2b7296a58fd9cb84758d9dcc0a8624
Fixed up testcases to use the new API; removed some hacks workarounds for the old testcases not working, and added a link to the namespace in the template as it doesn't say what it is anywhere
diff --git a/examples/foaf/template.html b/examples/foaf/template.html index 8a937af..096da4b 100644 --- a/examples/foaf/template.html +++ b/examples/foaf/template.html @@ -1,703 +1,707 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml...