• last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
whitespace changes

  1. … 10 more files in changeset.
MenuBar reform

- MenuBars are now easier programmatically extensible (easier to maintain)

- refactored code, reduced scatted definitions (all configurations

at the same place)

- unified templating:

use body property @body.folderHTML@ instead of @folderhtml@

From the former API calls only "update_items" has changed,

all existing configurations (i.e. via folders or package parameter)

should continue to work.

== Changes:

One can now extend menubars via menu entry definition

{config -use YOURCONFIG -class YOURCLASS}

in two directions:

a) subclassing

define your own menubar class YOURCLASS, which should

be a subclass of ::xowiki::MenuBar

b) provide your own configuration method to provide

a more tailored configuration. This is performed

by defining a method "config=YOURCONFIG" for ::xowiki::MenuBar

The latter method is used for test-items, which can define a

test item folder by using

-- extra_menu_entries ---

{config -use test-items}

instead of

-- extra_menu_entries ---

{entry -name New.Item.TextInteraction -form en:edit-interaction.wf -query p.item_type=Text}

{entry -name New.Item.ShortTextInteraction -form en:edit-interaction.wf -query p.item_type=ShortText}

{entry -name New.Item.SCInteraction -form en:edit-interaction.wf -query p.item_type=SC}

{entry -name New.Item.MCInteraction -form en:edit-interaction.wf -query p.item_type=MC}

{entry -name New.Item.ReorderInteraction -form en:edit-interaction.wf -query p.item_type=Reorder}

{entry -name New.Item.UploadInteraction -form en:edit-interaction.wf -query p.item_type=Upload}

{entry -name New.App.OnlineExam -form en:online-exam.wf}

{entry -name New.App.InclassQuiz -form en:inclass-quiz.wf}

{entry -name New.App.InclassExam -form en:inclass-exam.wf}

See below for the definition of the "test-items" configuration method,

which is based on the default definitions. In general, the definition

in this method can be performed via menu-entries (same syntax as in

other menu entries) or via the MenuBar API (e.g. calling

":add_menu_item ...").

All configurations follow the following definition order

where later entries can refine earlier entries:

- package level: package parameter ExtraMenuEntries

- configuration method: use standard or tailored confguration methods

- per-folder definition: content of the extra_menu_entries

Note that the menu entry definition language supports as well

adding/clearing menus, etc., so almost everything can be refined.

I've noticed that the tlf* code has several scattered menu

definitions, which are as well done in every case differently.

By these definition one can define e.g. a learning-app folder (where

"New" can be used to define new app folders), and the app folders can

provide their own "New" entries, e.g. for clickers and

others. E.g. For "clickers" there is already on non-oo definition to

achieve similar things (which should be altered to the new method),

but on other places, there are some hard-coded definitions for root

folders, etc. The menubars of the learning-apps should be made this

way more consistent with the rest (e.g. using "New", supporting "table

of contents" for clipboard interactions, etc.)

namespace eval ::xowiki {

::xowiki::MenuBar instproc config=test-items {

{-bind_vars {}}

-current_page:required

-package_id:required

-folder_link:required

-return_url

} {

:config=default \

-bind_vars $bind_vars \

-current_page $current_page \

-package_id $package_id \

-folder_link $folder_link \

-return_url $return_url

return {

{clear_menu -menu New}

{entry -name New.Item.TextInteraction -form en:edit-interaction.wf -query p.item_type=Text}

{entry -name New.Item.ShortTextInteraction -form en:edit-interaction.wf -query p.item_type=ShortText}

{entry -name New.Item.SCInteraction -form en:edit-interaction.wf -query p.item_type=SC}

{entry -name New.Item.MCInteraction -form en:edit-interaction.wf -query p.item_type=MC}

{entry -name New.Item.ReorderInteraction -form en:edit-interaction.wf -query p.item_type=Reorder}

{entry -name New.Item.UploadInteraction -form en:edit-interaction.wf -query p.item_type=Upload}

{entry -name New.App.OnlineExam -form en:online-exam.wf}

{entry -name New.App.InclassQuiz -form en:inclass-quiz.wf}

{entry -name New.App.InclassExam -form en:inclass-exam.wf}

}

}

}

  1. … 7 more files in changeset.
introduced "ad_file" as a means to avoid unexpected tilde substitution in file names

  1. … 41 more files in changeset.
added editor hints and white-space cleanup

  1. … 50 more files in changeset.
Remove conflict leftovers

Add 'require_html_procs' to the ::xo namespace in order to be compliant with OpenACS naming standards

  1. … 3 more files in changeset.
remove spurious colons

use ::template::head instead of broken variable substitution

file error-template.tcl was initially added on branch oacs-5-10.

    • -0
    • +0
    ./templates/error-template.tcl
add a plain template using the master

  1. … 1 more file in changeset.
file view-plain-master.adp was initially added on branch oacs-5-10.

    • -0
    • +0
    ./templates/view-plain-master.adp
use consistently xowiki.css variants based on the preferred CSS toolkit

  1. … 5 more files in changeset.
- modernize code (remove "my")

- prefer fully qualified commands based on IDs

  1. … 32 more files in changeset.
regenerated adp files

whitespace and spelling changes

  1. … 1 more file in changeset.
Bring files on oacs-5-10 in sync with HEAD

  1. … 154 more files in changeset.
- add URNs for jquery, bootstrap, get-http-object, xowiki.css and yui2

- fix return-string from popular-tags and improve stylability in includelet

- remove obsolete "header_stuff" from templates

- replace global parameters BootstrapCSS and BootstrapJS in favor of URNs

- bump version number to 5.10.0d6

  1. … 16 more files in changeset.
Fix typos

  1. … 16 more files in changeset.
Pass displayed_item_id

Regenerate ADP files

merged changes from the oacs-5-9 branch and resolved conflicts

    • -0
    • +95
    ./templates/oacs-view3-bootstrap.adp
    • -0
    • +102
    ./templates/oacs-view3-bootstrap3.adp
  1. … 7820 more files in changeset.
regenerated ducumentation

  1. … 243 more files in changeset.
Updated spanish translation

  1. … 5 more files in changeset.
bump version numbers to 5.9.1b9 respectively to 2.9.1b9 to prepare for release

  1. … 83 more files in changeset.
regenerated adp files

    • -12
    • +12
    ./templates/view-book-no-ajax.adp
remove typo

- make contributors link robust against subdirs

  1. … 1 more file in changeset.
- add istener only, when search is configured

- fix typo

  1. … 3 more files in changeset.
- don't offer search control in xowiki menu bar, when no search is configured on the system

- prefer usage of add_event_listener over add_body script

    • -10
    • +7
    ./templates/oacs-view3-bootstrap3.adp
  1. … 2 more files in changeset.