Permalink
Browse files

merge with default

  • Loading branch information...
2 parents e314467 + 535e68c commit 04e782944ee9f3fa84fbbcb328fe41ea5343aff3 @seebi seebi committed Oct 22, 2010
Showing with 15,514 additions and 2,892 deletions.
  1. +1 −1 .hgignore
  2. +2 −2 .hgsubstate
  3. +12 −5 Makefile
  4. +4 −0 application/Bootstrap.php
  5. +17 −3 application/classes/OntoWiki/Controller/Base.php
  6. +1 −4 application/classes/OntoWiki/Controller/Plugin/HttpAuth.php
  7. +2 −2 application/classes/OntoWiki/Menu/Registry.php
  8. +17 −7 application/classes/OntoWiki/Model/Resource.php
  9. +72 −62 application/classes/OntoWiki/Model/TitleHelper.php
  10. +3 −3 application/classes/OntoWiki/Module.php
  11. +13 −1 application/config/default.ini
  12. +6 −0 application/controllers/ApplicationController.php
  13. +5 −2 application/controllers/DebugController.php
  14. +1 −1 application/controllers/ModelController.php
  15. +17 −13 application/controllers/ResourceController.php
  16. +4 −2 application/controllers/ServiceController.php
  17. +0 −9 application/scripts/README.vad.txt
  18. +7 −0 application/scripts/makeBackup.sh
  19. +0 −2 application/scripts/vad/DB.PACK.VAD.isql
  20. +5 −13 application/scripts/vad/README.txt
  21. +0 −57 application/scripts/vad/files/config.ini
  22. +0 −4 application/scripts/vad/files/sticker_ending.txt
  23. +0 −19 application/scripts/vad/files/sticker_header.txt
  24. +0 −4 application/scripts/vad/files/sticker_post-uninstall.txt
  25. +0 −8 application/scripts/vad/files/sticker_pre-install.txt
  26. +0 −1 application/scripts/vad/files/sticker_pre-uninstall.txt
  27. +0 −18 application/scripts/vad/make_clean.sh
  28. +0 −23 application/scripts/vad/make_sticker_helper.sh
  29. +0 −32 application/scripts/vad/make_vad.sh
  30. +88 −0 application/scripts/vad/ow_vad_sticker_template.xml
  31. +32 −6 application/scripts/vad/{files/sticker_post-install.txt → ow_vad_sticker_template.xml_not_working}
  32. +74 −15 application/scripts/vad/prepare.sh
  33. +14 −14 application/scripts/vad/{files → }/vad.ini
  34. +21 −7 application/views/templates/model/info.phtml
  35. +3 −3 application/views/templates/partials/list.phtml
  36. +59 −76 application/views/templates/resource/properties.phtml
  37. +1 −1 extensions/components/datagathering/datagathering.js
  38. +1 −1 extensions/components/datagathering/scripts/jquery.autocomplete.js
  39. +423 −386 extensions/components/easyinference/EasyinferenceController.php
  40. +100 −64 extensions/components/easyinference/InfRule.php
  41. +1 −1 extensions/components/graphicalquerybuilder/GraphicalquerybuilderController.php
  42. +1 −1 extensions/components/graphicalquerybuilder/resources/graphicalquerybuilder.model.GQBClass.js
  43. +12 −1 extensions/components/graphicalquerybuilder/resources/graphicalquerybuilder.view.GQBView.init.js
  44. +17 −10 extensions/components/navigation/NavigationController.php
  45. +9 −7 extensions/components/pingback/PingbackController.php
  46. +1 −1 extensions/components/querybuilder/lib/AjaxAutocompletion.php
  47. +1 −1 extensions/components/querybuilder/lib/AjaxUpdateTable.php
  48. +5 −5 extensions/components/querybuilder/templates/querybuilder/manage.phtml
  49. +58 −3 extensions/components/site/SiteController.php
  50. +144 −39 extensions/components/site/SiteHelper.php
  51. +1 −0 extensions/components/site/component.ini
  52. +27 −0 extensions/components/site/helpers/Date.php
  53. +41 −0 extensions/components/site/helpers/Objectlist.php
  54. +54 −0 extensions/components/site/helpers/Processtidy.php
  55. +9 −7 extensions/components/site/helpers/Querylist.php
  56. +33 −0 extensions/components/site/helpers/Url.php
  57. +8 −0 extensions/components/site/sites/generic/content.phtml
  58. 0 extensions/components/site/sites/{lod2 → generic}/css/960.css
  59. 0 extensions/components/site/sites/{lod2 → generic}/css/grid.css
  60. 0 extensions/components/site/sites/{lod2 → generic}/css/ie.css
  61. 0 extensions/components/site/sites/{lod2 → generic}/css/ie6.css
  62. +520 −0 extensions/components/site/sites/generic/css/layout.css
  63. 0 extensions/components/site/sites/{lod2 → generic}/css/main.css
  64. 0 extensions/components/site/sites/{lod2 → generic}/css/nav.css
  65. 0 extensions/components/site/sites/{lod2 → generic}/css/reset.css
  66. 0 extensions/components/site/sites/{lod2 → generic}/css/text.css
  67. +23 −0 extensions/components/site/sites/generic/default.phtml
  68. +9 −0 extensions/components/site/sites/generic/feed.phtml
  69. +46 −0 extensions/components/site/sites/generic/item.phtml
  70. +13 −0 extensions/components/site/sites/generic/items/abstract.phtml
  71. +22 −0 extensions/components/site/sites/generic/items/li.phtml
  72. +103 −0 extensions/components/site/sites/generic/js/jquery-fluid16.js
  73. +11 −0 extensions/components/site/sites/generic/lastchange.phtml
  74. +220 −0 extensions/components/site/sites/generic/layout.phtml
  75. +47 −0 extensions/components/site/sites/generic/main.phtml
  76. +44 −0 extensions/components/site/sites/generic/model/Makefile
  77. +839 −0 extensions/components/site/sites/generic/model/doap.rdf
  78. +604 −0 extensions/components/site/sites/generic/model/foaf.rdf
  79. +18 −0 extensions/components/site/sites/generic/model/lod2-config.n3
  80. +29 −0 extensions/components/site/sites/generic/model/lod2-config.rdf
  81. 0 extensions/components/site/sites/{lod2 → generic}/model/lod2-data-all.n3
  82. +89 −0 extensions/components/site/sites/generic/model/lod2-data.n3
  83. +607 −0 extensions/components/site/sites/generic/model/lod2-data.rdf
  84. +96 −0 extensions/components/site/sites/generic/model/lod2-schema.n3
  85. +62 −0 extensions/components/site/sites/generic/model/lod2-schema.rdf
  86. +10 −0 extensions/components/site/sites/generic/model/partner.txt
  87. +12 −0 extensions/components/site/sites/generic/model/partner/cwi.n3
  88. +10 −0 extensions/components/site/sites/generic/model/partner/exalead.n3
  89. +17 −0 extensions/components/site/sites/generic/model/partner/fub.n3
  90. +13 −0 extensions/components/site/sites/generic/model/partner/nuig.n3
  91. +12 −0 extensions/components/site/sites/generic/model/partner/okfn.n3
  92. +11 −0 extensions/components/site/sites/generic/model/partner/openlink.n3
  93. +9 −0 extensions/components/site/sites/generic/model/partner/swc.n3
  94. +9 −0 extensions/components/site/sites/generic/model/partner/tenforce.n3
  95. +23 −0 extensions/components/site/sites/generic/model/partner/ulei.n3
  96. +13 −0 extensions/components/site/sites/generic/model/partner/wkd.n3
  97. +851 −0 extensions/components/site/sites/generic/model/sioc.rdf
  98. +468 −0 extensions/components/site/sites/generic/model/skos.rdf
  99. +42 −0 extensions/components/site/sites/generic/model/work/cluster.n3
  100. 0 extensions/components/site/sites/generic/model/work/deliverables.n3
  101. +131 −0 extensions/components/site/sites/generic/model/work/milestones.n3
  102. +84 −0 extensions/components/site/sites/generic/model/work/workpackages.n3
  103. +21 −0 extensions/components/site/sites/generic/query.phtml
  104. +23 −0 extensions/components/site/sites/generic/types/article.phtml
  105. +23 −0 extensions/components/site/sites/generic/types/partner.phtml
  106. +23 −0 extensions/components/site/sites/generic/types/person.phtml
  107. +23 −0 extensions/components/site/sites/generic/types/project.phtml
  108. +99 −0 extensions/components/site/sites/generic/types/workpackage.phtml
  109. +5 −2 extensions/components/site/sites/lod2/config.ini
  110. +17 −0 extensions/components/site/sites/lod2/content-side-bottom.phtml
  111. +17 −0 extensions/components/site/sites/lod2/content-side-top.phtml
  112. +20 −4 extensions/components/site/sites/lod2/content.phtml
  113. +468 −0 extensions/components/site/sites/lod2/css/content.css
  114. +310 −520 extensions/components/site/sites/lod2/css/layout.css
  115. +48 −0 extensions/components/site/sites/lod2/css/patches/ie6.css
  116. +16 −0 extensions/components/site/sites/lod2/css/styleimports.css
  117. +14 −11 extensions/components/site/sites/lod2/default.phtml
  118. +8 −5 extensions/components/site/sites/lod2/feed.phtml
  119. BIN extensions/components/site/sites/lod2/img/icon-linkarrow.png
  120. BIN extensions/components/site/sites/lod2/img/logo-7fp.png
  121. BIN extensions/components/site/sites/lod2/img/logo-lod2.png
  122. +10 −6 extensions/components/site/sites/lod2/item.phtml
  123. +28 −10 extensions/components/site/sites/lod2/items/abstract.phtml
  124. +68 −0 extensions/components/site/sites/lod2/items/testimonial.phtml
  125. +1 −1 extensions/components/site/sites/lod2/lastchange.phtml
  126. +190 −187 extensions/components/site/sites/lod2/layout.phtml
  127. +184 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/accessible-tabs/jquery.tabs.js
  128. +131 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/accessible-tabs/tabs.css
  129. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/external_link.png
  130. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/hcalendar.png
  131. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/hcard.png
  132. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-geo.png
  133. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hatom.png
  134. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-haudio.png
  135. BIN ...sions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hcalendar-add.png
  136. BIN .../components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hcalendar-download.png
  137. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hcalendar.png
  138. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hcard-add.png
  139. BIN ...ions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hcard-download.png
  140. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hcard.png
  141. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-hresume.png
  142. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-rel-tag.png
  143. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/icon-xfn.png
  144. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-child.png
  145. BIN ...ns/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-colleague-met.png
  146. BIN ...nsions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-colleague.png
  147. BIN ...sions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-friend-met.png
  148. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-friend.png
  149. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-me.png
  150. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-parent.png
  151. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-small.png
  152. BIN extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-spouse.png
  153. BIN ...s/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-sweetheart-met.png
  154. BIN ...sions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/images/xfn/xfn-sweetheart.png
  155. +169 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/microformats/microformats.css
  156. +92 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/core/base-rtl.css
  157. +54 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/core/iehacks-rtl.css
  158. +15 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/core/slim_base-rtl.css
  159. +8 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/core/slim_iehacks-rtl.css
  160. +49 −0 .../components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/navigation/nav_shinybuttons-rtl.css
  161. +44 −0 ...s/components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/navigation/nav_slidingdoor-rtl.css
  162. +62 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/rtl-support/navigation/nav_vlist-rtl.css
  163. +70 −0 extensions/components/site/sites/lod2/libs/yaml_321/add-ons/syncheight/jquery.syncheight.js
  164. +27 −0 extensions/components/site/sites/lod2/libs/yaml_321/central_draft.css
  165. +277 −0 extensions/components/site/sites/lod2/libs/yaml_321/core/base.css
  166. +352 −0 extensions/components/site/sites/lod2/libs/yaml_321/core/iehacks.css
  167. +63 −0 extensions/components/site/sites/lod2/libs/yaml_321/core/js/yaml-focusfix.js
  168. +6 −0 extensions/components/site/sites/lod2/libs/yaml_321/core/slim_base.css
  169. +6 −0 extensions/components/site/sites/lod2/libs/yaml_321/core/slim_iehacks.css
  170. +72 −0 extensions/components/site/sites/lod2/libs/yaml_321/markup_draft.html
  171. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/shiny_buttons/background.png
  172. BIN ...ns/components/site/sites/lod2/libs/yaml_321/navigation/images/shiny_buttons/background_active.png
  173. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/sliding_door/round/bg.gif
  174. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/sliding_door/round/left.png
  175. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/sliding_door/round/left_on.png
  176. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/sliding_door/round/right.png
  177. BIN ...nsions/components/site/sites/lod2/libs/yaml_321/navigation/images/sliding_door/round/right_on.png
  178. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/vlist/square/node.gif
  179. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/vlist/square/node_minus.gif
  180. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/vlist/square/node_plus.gif
  181. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/vlist/square/subnode.gif
  182. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/vlist/square/subnode_minus.gif
  183. BIN extensions/components/site/sites/lod2/libs/yaml_321/navigation/images/vlist/square/subnode_plus.gif
  184. +93 −0 extensions/components/site/sites/lod2/libs/yaml_321/navigation/nav_shinybuttons.css
  185. +123 −0 extensions/components/site/sites/lod2/libs/yaml_321/navigation/nav_slidingdoor.css
  186. +123 −0 extensions/components/site/sites/lod2/libs/yaml_321/navigation/nav_vlist.css
  187. +29 −0 extensions/components/site/sites/lod2/libs/yaml_321/patches/patch_layout_draft.css
  188. +60 −0 extensions/components/site/sites/lod2/libs/yaml_321/patches/patch_nav_vlist.css
  189. +77 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_003_draft.css
  190. +75 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_020_draft.css
  191. +92 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_023_draft.css
  192. +75 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_100_draft.css
  193. +91 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_103_draft.css
  194. +92 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_120_draft.css
  195. +92 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_123_draft.css
  196. +63 −0 extensions/components/site/sites/lod2/libs/yaml_321/print/print_draft.css
  197. +102 −0 extensions/components/site/sites/lod2/libs/yaml_321/screen/basemod_draft.css
  198. +223 −0 extensions/components/site/sites/lod2/libs/yaml_321/screen/content_default.css
  199. +310 −0 extensions/components/site/sites/lod2/libs/yaml_321/screen/forms.css
  200. BIN extensions/components/site/sites/lod2/libs/yaml_321/screen/images/button_gray.png
  201. BIN extensions/components/site/sites/lod2/libs/yaml_321/screen/images/button_red.png
  202. BIN extensions/components/site/sites/lod2/libs/yaml_321/screen/images/button_yellow.png
  203. +29 −13 extensions/components/site/sites/lod2/main.phtml
  204. +23 −0 extensions/components/site/sites/lod2/micro-navigation.phtml
  205. +7 −5 extensions/components/site/sites/lod2/model/Makefile
  206. +133 −14 extensions/components/site/sites/lod2/model/lod2-data.n3
  207. +41 −1 extensions/components/site/sites/lod2/model/lod2-schema.n3
  208. +10 −10 extensions/components/site/sites/lod2/model/partner.txt
  209. +11 −0 extensions/components/site/sites/lod2/model/partner/cwi.n3
  210. +4 −0 extensions/components/site/sites/lod2/model/partner/exalead.n3
  211. +122 −7 extensions/components/site/sites/lod2/model/partner/fub.n3
  212. +69 −0 extensions/components/site/sites/lod2/model/partner/nuig.n3
  213. +14 −1 extensions/components/site/sites/lod2/model/partner/okfn.n3
  214. +23 −1 extensions/components/site/sites/lod2/model/partner/openlink.n3
  215. +16 −0 extensions/components/site/sites/lod2/model/partner/swc.n3
  216. +4 −0 extensions/components/site/sites/lod2/model/partner/tenforce.n3
  217. +53 −2 extensions/components/site/sites/lod2/model/partner/ulei.n3
  218. +4 −0 extensions/components/site/sites/lod2/model/partner/wkd.n3
  219. +64 −0 extensions/components/site/sites/lod2/model/people.n3
  220. +62 −0 extensions/components/site/sites/lod2/model/testimonials.n3
  221. +8 −0 extensions/components/site/sites/lod2/model/work/cluster.n3
  222. +49 −0 extensions/components/site/sites/lod2/model/work/datechange-deliverables.sh
  223. +16 −0 extensions/components/site/sites/lod2/model/work/datechange-milestones.sh
  224. +1,053 −0 extensions/components/site/sites/lod2/model/work/deliverables.n3
  225. +60 −52 extensions/components/site/sites/lod2/model/work/milestones.n3
  226. +58 −12 extensions/components/site/sites/lod2/model/work/workpackages.n3
  227. +28 −0 extensions/components/site/sites/lod2/modules/feeds/feeds.phtml
  228. +29 −0 extensions/components/site/sites/lod2/modules/similarinstances/similarinstances.phtml
  229. +10 −8 extensions/components/site/sites/lod2/query.phtml
  230. +52 −0 extensions/components/site/sites/lod2/testimonials.phtml
  231. +75 −11 extensions/components/site/sites/lod2/types/article.phtml
  232. +112 −0 extensions/components/site/sites/lod2/types/cluster.phtml
  233. +44 −0 extensions/components/site/sites/lod2/types/deliverable.phtml
  234. +91 −0 extensions/components/site/sites/lod2/types/milestone.phtml
  235. +80 −10 extensions/components/site/sites/lod2/types/partner.phtml
  236. +68 −17 extensions/components/site/sites/lod2/types/person.phtml
  237. +34 −15 extensions/components/site/sites/lod2/types/project.phtml
  238. +55 −0 extensions/components/site/sites/lod2/types/testimonial.phtml
  239. +91 −67 extensions/components/site/sites/lod2/types/workpackage.phtml
  240. +27 −15 extensions/modules/bookmarklet/bookmarklet.phtml
  241. +22 −13 extensions/modules/easyinference/easyInferenceMenu.php
  242. +35 −39 extensions/modules/easyinference/easyinference.php
  243. +3 −3 extensions/modules/easyinference/languages/{easyinference-de.csv → easyinference-en.csv}
  244. +15 −5 extensions/modules/feeds/feeds.phtml
  245. +1 −1 extensions/modules/feeds/module.ini
  246. +6 −1 extensions/modules/navigation/module.ini
  247. +3 −0 extensions/modules/navigation/navigation.php
  248. +1 −1 extensions/modules/tagging/tagging.js
  249. +128 −96 extensions/plugins/easyinference/easyinference.php
  250. +1 −1 extensions/plugins/easyinference/languages/easyinference-de.csv
  251. +1 −0 extensions/plugins/linkeddata/plugin.ini
  252. +32 −0 extensions/plugins/literaltypes/literaltypes.php
  253. +9 −0 extensions/plugins/literaltypes/plugin.ini
  254. +8 −14 extensions/plugins/markdown/markdown.php
  255. 0 extensions/plugins/markdown/parser/{PHP Markdown Readme.text → PHP_Markdown_Readme.txt}
  256. +1 −1 extensions/plugins/markdown/plugin.ini
  257. +3 −3 extensions/plugins/pingback/pingback.php
  258. +1 −1 extensions/plugins/pingback/plugin.ini
  259. +1 −0 extensions/plugins/selectlanguage/languages/selectlanguage-de.csv
  260. +13 −0 extensions/plugins/selectlanguage/plugin.ini
  261. +80 −0 extensions/plugins/selectlanguage/selectlanguage.php
  262. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
  263. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
  264. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png
  265. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png
  266. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png
  267. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png
  268. BIN extensions/themes/silverblue/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png
  269. BIN extensions/themes/silverblue/images/jquery-ui/ui-icons_0073ea_256x240.png
  270. BIN extensions/themes/silverblue/images/jquery-ui/ui-icons_454545_256x240.png
  271. BIN extensions/themes/silverblue/images/jquery-ui/ui-icons_666666_256x240.png
  272. BIN extensions/themes/silverblue/images/jquery-ui/ui-icons_ff0084_256x240.png
  273. BIN extensions/themes/silverblue/images/jquery-ui/ui-icons_ffffff_256x240.png
  274. +585 −437 extensions/themes/silverblue/scripts/libraries/jquery-ui.js
  275. +85 −118 extensions/themes/silverblue/scripts/main.js
  276. +91 −92 extensions/themes/silverblue/scripts/support.js
  277. BIN extensions/themes/silverblue/styles/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  278. BIN extensions/themes/silverblue/styles/images/ui-bg_diagonals-thick_20_666666_40x40.png
  279. BIN extensions/themes/silverblue/styles/images/ui-bg_flat_10_000000_40x100.png
  280. BIN extensions/themes/silverblue/styles/images/ui-bg_glass_100_f6f6f6_1x400.png
  281. BIN extensions/themes/silverblue/styles/images/ui-bg_glass_100_fdf5ce_1x400.png
  282. BIN extensions/themes/silverblue/{images/jquery-ui → styles/images}/ui-bg_glass_65_ffffff_1x400.png
  283. BIN extensions/themes/silverblue/styles/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  284. BIN extensions/themes/silverblue/styles/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  285. BIN extensions/themes/silverblue/styles/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  286. BIN extensions/themes/silverblue/styles/images/ui-icons_222222_256x240.png
  287. BIN extensions/themes/silverblue/styles/images/ui-icons_228ef1_256x240.png
  288. BIN extensions/themes/silverblue/styles/images/ui-icons_ef8c08_256x240.png
  289. BIN extensions/themes/silverblue/styles/images/ui-icons_ffd27a_256x240.png
  290. BIN extensions/themes/silverblue/styles/images/ui-icons_ffffff_256x240.png
  291. +276 −110 extensions/themes/silverblue/styles/jquery-ui.css
  292. +3 −0 extensions/translations/de/core.csv
  293. +4 −2 index.php
View
@@ -13,4 +13,4 @@ nbproject
cache
libraries/Zend
libraries/ZendFramework-1.*
-
+BlogPost
View
@@ -1,2 +1,2 @@
-ce9e4536e003362bf48e07c5c4d2f5b207ed800c libraries/Erfurt
-648dfd33999d62680e5f35be8a0b1479c53c1466 libraries/RDFauthor
+85970ba39beefa291e49cb8dcb8d61bdd0310a82 libraries/Erfurt
+4b5dfe06bd79fb031e45cf8ee0a2954479bc7878 libraries/RDFauthor
View
@@ -6,20 +6,27 @@ default:
@echo " 'make zend' (download and install Zend under libraries)"
pull:
- hg --repository . pull
- hg --repository libraries/Erfurt pull
+ @hg --repository . pull
+ @hg --repository libraries/Erfurt pull
+ @hg --repository libraries/RDFauthor pull
-update:
- hg --repository . pull -u
- hg --repository libraries/Erfurt pull -u
+update: pull
+ @echo "\nOntoWiki"
+ hg --repository . update
+ @echo "\nErfurt"
+ hg --repository libraries/Erfurt update
+ @echo "\nRDFauthor"
+ hg --repository libraries/RDFauthor update
status:
hg --repository . status
hg --repository libraries/Erfurt status
+ hg --repository libraries/RDFauthor status
branch-check:
hg --repository . branch
hg --repository libraries/Erfurt branch
+ hg --repository libraries/RDFauthor branch
zend:
rm -rf libraries/Zend
@@ -584,6 +584,9 @@ public function _initView()
. $config->themes->default
. 'templates';
+ $moduleTemplatePath = ONTOWIKI_ROOT
+ . $config->extensions->modules;
+
$viewOptions = array(
'use_module_cachce' => (bool)$config->cache->modules,
'cache_path' => $config->cache->path,
@@ -595,6 +598,7 @@ public function _initView()
$view = new OntoWiki_View($viewOptions, $translate);
$view->addScriptPath($defaultTemplatePath) // default templates
->addScriptPath($themeTemplatePath) // theme templates override default ones
+ ->addScriptPath($moduleTemplatePath)
->setEncoding($config->encoding)
->setHelperPath(ONTOWIKI_ROOT . 'application/classes/OntoWiki/View/Helper', 'OntoWiki_View_Helper');
@@ -102,15 +102,30 @@ public function init()
$this->view->headMeta()->setHttpEquiv('Content-Type', 'text/html; charset=' . $this->_config->encoding);
$this->view->headMeta()->setName('generator', 'OntoWiki — Collaborative Knowledge Engineering');
+ // RDFauthor view configuration
+ $viewMode = isset($this->_config->rdfauthor->viewmode)
+ ? $this->_config->rdfauthor->viewmode
+ : 'inline';
+
// inject JSON variables into view
$this->view->jsonVars = '
var urlBase = "' . $this->_config->urlBase . '";
var themeUrlBase = "' . $this->_config->themeUrlBase . '";
var _OWSESSION = "' . _OWSESSION . '";
- var RDFAUTHOR_BASE = "' . $this->_config->staticUrlBase . 'libraries/RDFauthor/";' . PHP_EOL;
+ var RDFAUTHOR_BASE = "' . $this->_config->staticUrlBase . 'libraries/RDFauthor/";
+ var RDFAUTHOR_VIEW_MODE = "' . $viewMode . '";' . PHP_EOL;
if (defined('_OWDEBUG')) {
- $this->view->jsonVars .= 'var RDFAUTHOR_DEBUG = 1;';
+ $this->view->jsonVars .= ' var RDFAUTHOR_DEBUG = 1;';
+ }
+
+ if ($this->_owApp->selectedModel) {
+ $this->view->jsonVars .= '
+ var selectedGraph = {
+ URI: "' . (string)$this->_owApp->selectedModel . '",
+ title: "' . (string)$this->_owApp->selectedModel->getTitle() . '"
+ };
+ var RDFAUTHOR_DEFAULT_GRAPH = "' . (string)$this->_owApp->selectedModel . '";' . PHP_EOL;
}
if ($this->_owApp->selectedResource) {
@@ -120,7 +135,6 @@ public function init()
title: "' . (string)$this->_owApp->selectedResource->getTitle() . '",
graphURI: "' . (string)$this->_owApp->selectedModel . '"
};
- var RDFAUTHOR_DEFAULT_GRAPH = "' . (string)$this->_owApp->selectedModel . '";
var RDFAUTHOR_DEFAULT_SUBJECT = "' . (string)$this->_owApp->selectedResource . '";' . PHP_EOL;
}
@@ -72,9 +72,7 @@ public function routeShutdown(Zend_Controller_Request_Abstract $request)
private function _getAuthHeaderCredentials(Zend_Controller_Request_Abstract $request)
{
$authHeader = $request->getHeader('Authorization');
-
if (is_string($authHeader) && strlen($authHeader) > 0) {
-
if (strtolower(substr($authHeader, 0, 8)) === 'foaf+ssl') {
$auth = base64_decode(substr($authHeader, 9));
$creds = explode('=', $auth);
@@ -93,8 +91,7 @@ private function _getAuthHeaderCredentials(Zend_Controller_Request_Abstract $req
} else if (strtolower(substr($authHeader, 0, 5)) === 'basic') {
$auth = base64_decode(substr($authHeader, 6));
$creds = array_filter(explode(':', $auth));
-
- if (count($creds) > 1) {
+ if (count($creds) > 0) {
return array(
'type' => 'basic',
'username' => $creds[0],
@@ -126,7 +126,7 @@ private function _getApplicationMenu()
}
$extrasMenu->setEntry('News', $owApp->config->urlBase . 'index/news');
- // help sub menu
+ // help sub menue
$helpMenu = new OntoWiki_Menu();
$helpMenu->setEntry('Documentation', 'http://ontowiki.net/Projects/OntoWiki/Help')
->setEntry('Bug Report', 'http://code.google.com/p/ontowiki/issues/entry')
@@ -147,7 +147,7 @@ private function _getApplicationMenu()
$debugMenu = new OntoWiki_Menu();
$debugMenu->setEntry('Clear Module Cache', $owApp->config->urlBase . 'debug/clearmodulecache')
->setEntry('Clear Translation Cache', $owApp->config->urlBase . 'debug/cleartranslationcache')
- ->setEntry('Clear Query Cache', $owApp->config->urlBase . 'debug/clearquerycache')
+ ->setEntry('Clear Object & Query Cache', $owApp->config->urlBase . 'debug/clearquerycache')
->setEntry('Destroy Session', $owApp->config->urlBase . 'debug/destroysession');
// for testing sub menus
@@ -207,6 +207,7 @@ public function getValues()
'curi' => null
);
+
switch ($row['object']['type']) {
case 'uri':
// every URI objects is only used once for each statement
@@ -250,9 +251,19 @@ public function getValues()
break;
case 'typed-literal':
+ $event = new Erfurt_Event('onDisplayLiteralPropertyValue');
$value['datatype'] = OntoWiki_Utils::compactUri($row['object']['datatype']);
- /* fallthrough */
+ $event->value = $row['object']['value'];
+ $event->datatype = $row['object']['datatype'];
+ $event->property = $predicateUri;
+ $value['object'] = $event->trigger();
+ if (!$event->handled()) {
+ // object (modified by plug-ins)
+ $value['object'] = $row['object']['value'];
+ }
+
+ break;
case 'literal':
// original (unmodified) for RDFa
$value['content'] = $row['object']['value'];
@@ -266,19 +277,18 @@ public function getValues()
$event->value = $row['object']['value'];
$event->property = $predicateUri;
+ // set literal language
+ if (isset($row['object']['xml:lang'])) {
+ $value['lang'] = $row['object']['xml:lang'];
+ $event->language = $row['object']['xml:lang'];
+ }
// trigger
$value['object'] = $event->trigger();
// set default if event has not been handled
if (!$event->handled()) {
$value['object'] = $row['object']['value'];
}
-
- // set literal language
- if (isset($row['object']['xml:lang'])) {
- $value['lang'] = $row['object']['xml:lang'];
- }
-
break;
}
@@ -30,6 +30,11 @@ class OntoWiki_Model_TitleHelper
const RESOURCE_VARIABLE = '__resource';
/**
+ * Static title cache per graph
+ */
+ protected static $_titleCache = array();
+
+ /**
* Whether to always search all configured title properties
* in order to find the best language match or stop at the
* first matching title property.
@@ -306,73 +311,78 @@ public function getResourceQuery()
*/
public function getTitle($resourceUri, $language = null)
{
- // * means any language
- if (trim($language) == '*') {
- $language = null;
- }
-
- // add if we don't have this URI (but logg)
- if (!array_key_exists($resourceUri, (array)$this->_resources)) {
- $logger = OntoWiki::getInstance()->logger;
- $logger->info('TitleHelper: getTitle called for unknown resource. Adding resource before fetch.');
- $this->addResource($resourceUri);
- }
-
- // HACK: fix a probable Virtuoso bug with querying
- // for only one resource
- if (count((array)$this->_resources) < 2) {
- // add a dummy resource ;)
- $this->addResource('http://example.com/dummy');
- }
-
- // if this is the first getTitle request, fetch titles
- if (null === $this->_resourceTitles) {
- $this->_fetchResourceTitlesFromQueryResult(self::RESOURCE_VARIABLE);
- }
-
- // prepend the language that is asked for to the array
- // of languages we will look for
- $languages = $this->_languages;
- if (null !== $language) {
- array_unshift($languages, (string)$language);
- }
-
- $title = null;
- // has anything been found for the resource?
- if (array_key_exists($resourceUri, $this->_resourceTitles)) {
- $titleProperties = (array)$this->_resourceTitles[$resourceUri];
-
- $currentBestLanguage = PHP_INT_MAX;
- foreach ($this->_titleProperties as $currentTitleProperty) {
- // has the property been found for the resource?
- if (array_key_exists($currentTitleProperty, $titleProperties)) {
-
- for ($i = 0, $max = count($languages); $i < $max; $i++) {
- $currentLanguage = $languages[$i];
-
- if (($i < $currentBestLanguage) && isset($titleProperties[$currentTitleProperty][$currentLanguage])) {
- $title = $titleProperties[$currentTitleProperty][$currentLanguage];
- $currentBestLanguage = $i;
- // var_dump(sprintf('%d/%d: %s', $currentBestLanguage, $i, $title));
-
- if (!$this->_alwaysSearchAllProperties || ($currentBestLanguage === 0)) {
- // it won't get better :)
- break(2);
+ if (!isset(self::$_titleCache[(string) $this->_model][$resourceUri])) {
+ // * means any language
+ if (trim($language) == '*') {
+ $language = null;
+ }
+
+ // add if we don't have this URI (but logg)
+ if (!array_key_exists($resourceUri, (array)$this->_resources)) {
+ $logger = OntoWiki::getInstance()->logger;
+ $logger->info('TitleHelper: getTitle called for unknown resource. Adding resource before fetch.');
+ $this->addResource($resourceUri);
+ }
+
+ // HACK: fix a probable Virtuoso bug with querying
+ // for only one resource
+ if (count((array)$this->_resources) < 2) {
+ // add a dummy resource ;)
+ $this->addResource('http://example.com/dummy');
+ }
+
+ // if this is the first getTitle request, fetch titles
+ if (null === $this->_resourceTitles) {
+ $this->_fetchResourceTitlesFromQueryResult(self::RESOURCE_VARIABLE);
+ }
+
+ // prepend the language that is asked for to the array
+ // of languages we will look for
+ $languages = $this->_languages;
+ if (null !== $language) {
+ array_unshift($languages, (string)$language);
+ }
+
+ $title = null;
+ // has anything been found for the resource?
+ if (array_key_exists($resourceUri, $this->_resourceTitles)) {
+ $titleProperties = (array)$this->_resourceTitles[$resourceUri];
+
+ $currentBestLanguage = PHP_INT_MAX;
+ foreach ($this->_titleProperties as $currentTitleProperty) {
+ // has the property been found for the resource?
+ if (array_key_exists($currentTitleProperty, $titleProperties)) {
+
+ for ($i = 0, $max = count($languages); $i < $max; $i++) {
+ $currentLanguage = $languages[$i];
+
+ if (($i < $currentBestLanguage) && isset($titleProperties[$currentTitleProperty][$currentLanguage])) {
+ $title = $titleProperties[$currentTitleProperty][$currentLanguage];
+ $currentBestLanguage = $i;
+ // var_dump(sprintf('%d/%d: %s', $currentBestLanguage, $i, $title));
+
+ if (!$this->_alwaysSearchAllProperties || ($currentBestLanguage === 0)) {
+ // it won't get better :)
+ break(2);
+ }
}
}
}
}
}
- }
-
- // still not found?
- if (null === $title) {
- $title = OntoWiki_Utils::contractNamespace($resourceUri);
-
- // not even namespace found?
- if ($title == $resourceUri and $this->_alwaysUseLocalNames) {
- $title = OntoWiki_Utils::getUriLocalPart($resourceUri);
- }
+
+ // still not found?
+ if (null === $title) {
+ $title = OntoWiki_Utils::contractNamespace($resourceUri);
+
+ // not even namespace found?
+ if ($title == $resourceUri and $this->_alwaysUseLocalNames) {
+ $title = OntoWiki_Utils::getUriLocalPart($resourceUri);
+ }
+ }
+ } else {
+ // cached title
+ $title = self::$_titleCache[(string) $this->_model][$resourceUri];
}
return $title;
@@ -119,9 +119,9 @@ public function __construct($name, $context, $options)
// set script path if necessary
$modulesPath = ONTOWIKI_ROOT . $this->_config->extensions->modules;
- if (!in_array($modulesPath, $this->view->getScriptPaths())) {
- $this->view->addScriptPath($modulesPath);
- }
+ // if (!in_array($modulesPath, $this->view->getScriptPaths())) {
+ // $this->view->addScriptPath($modulesPath);
+ // }
// Parse the private config
@@ -93,7 +93,7 @@ descriptionHelper.properties.skosEditorialNote = "http://www.w3.org/2004/02/skos
; Version info
;;
version.label = "OntoWiki"
-version.number = "0.9.5"
+version.number = "0.9.6"
version.suffix = "alpha"
@@ -154,6 +154,13 @@ libraries.path = "libraries"
themes.default = "silverblue"
themes.path = "extensions/themes"
+;;
+; View mode for editing properties
+; Editing a different resource than the one currently shown is
+; always done in popover mode!
+; Possible values: inline, popover
+;;
+rdfauthor.viewmode = 'inline'
;;
; Extension directories
@@ -258,3 +265,8 @@ cache.query.enable = 1
;cache.query.logging = 0
;; only database caching at the moment
cache.query.type = database
+
+;; Erfurt Object Cache
+cache.enable = 0 ; clear the cache if you switch from 0 to 1!
+cache.type = database ; database, sqllite
+
Oops, something went wrong.

0 comments on commit 04e7829

Please sign in to comment.