Index: openacs-4/packages/xowiki/tcl/category-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/tcl/category-procs.tcl 3 Mar 2006 18:58:16 -0000 1.3 +++ openacs-4/packages/xowiki/tcl/category-procs.tcl 18 Apr 2006 00:06:14 -0000 1.4 @@ -1,64 +1,112 @@ namespace eval ::xowiki { - Class CatTree -superclass ::xo::OrderedComposite -parameter order_items_by + # + # ::xowiki::CatTree (category tree) + # + Class CatTree -superclass ::xo::OrderedComposite -parameter {name ""} + CatTree instproc add_to_category { - -category_id - -itemobj - {-pos 0} + -category + -orderby + -itemobj + {-increasing:boolean true} {-open_item:boolean false} } { - set catobj [self]::$category_id - if {![my isobject $catobj]} { - ::xo::OrderedComposite create $catobj - if {[my exists order_items_by]} { - $catobj orderby [my set order_items_by] + set items ${category}::items + if {![my isobject $items]} { + ::xo::OrderedComposite create $items + if {[info exists orderby]} { + set direction [expr {$increasing?"increasing":"decreasing"}] + $items orderby -order $direction $orderby } - $catobj set pos $pos - $catobj set open_requests 0 - my add $catobj } + $items add $itemobj if {$open_item} { - $catobj incr open_requests + $category openTree $itemobj set open_item 1 } - $catobj add $itemobj } + CatTree instproc openTree {} {;} - CatTree instproc render {} { + CatTree instproc render {{-tree_style:boolean false}} { + if {$tree_style} { + #::xowiki::Page requireCSS "/resources/acs-templating/mktree.css" + ::xowiki::Page requireCSS "/resources/xowiki/cattree.css" + ::xowiki::Page requireJS "/resources/acs-templating/mktree.js" + + foreach c [my children] {append content [$c render] \n} + return "" + } else { + Category instmixin Category::section_style + foreach c [my children] {append content [$c render] \n} + Category instmixin "" + return $content + } + } + + # + # ::xowiki::Category + # + + Class Category -superclass ::xo::OrderedComposite -parameter { + level label pos category_id {open_requests 0} + } + Category instproc destroy {} { + my log -- + next + } + Category instproc openTree {} { + my set open_requests 1 + if {[my exists __parent]} {[my set __parent] openTree} + } + + Category instproc render {} { set content "" - foreach c [my children] { - set cat_content "" - foreach i [$c children] { - $i instvar title page_title prefix open_item - set openProps [expr {[info exists open_item] ? [list ] : {}}] - append cat_content [lindex $openProps 0] $prefix " $page_title" [lindex $openProps 1] "
\n" + if {[my isobject [self]::items]} { + foreach i [[self]::items children] { + $i instvar title page_title prefix suffix + set entry "$prefix$page_title$suffix" + append cat_content [my render_item -highlight [$i exists open_item] $entry] } - append content "

[category::get_name [namespace tail $c]]

" \ - $cat_content "
\n" + foreach c [my children] {append cat_content [$c render] \n} + append content [my render_category -open [expr {[my set open_requests]>0}] $cat_content] } return $content } - CatTree instproc render-li {} { - ::xowiki::Page requireCSS "/resources/acs-templating/mktree.css" - ::xowiki::Page requireJS "/resources/acs-templating/mktree.js" - set content "" } + Category instproc render_category {{-open:boolean false} cat_content} { + set open_state [expr {[my set open_requests]>0?"class='liOpen'" : "class='liClosed'"}] + return "
  • [my label]\n \n" + } + # + # These are the section-specific rendering functions + # + + Class Category::section_style + Category::section_style instproc render_item {{-highlight:boolean false} item} { + if {$highlight} { + return "$item
    \n" + } else { + return "$item
    \n" + } + } + Category::section_style instproc render_category {{-open:boolean false} cat_content} { + set section [expr {[my level] + 2}] + return "[my label]\n

    \ +

    $cat_content
    \n" + } + + } Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 16 Apr 2006 19:32:04 -0000 1.27 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 18 Apr 2006 00:06:14 -0000 1.28 @@ -16,7 +16,7 @@ ::Generic::Attribute new -attribute_name page_title -datatype text \ -pretty_name "Page Title" ::Generic::Attribute new -attribute_name creator -datatype text \ - -pretty_name "Creator" + -pretty_name "Creator" } \ -form ::xowiki::WikiForm @@ -30,16 +30,16 @@ ::Generic::CrClass create PageTemplate -superclass Page \ -pretty_name "XoWiki Page Template" -pretty_plural "XoWiki Page Templates" \ -table_name "xowiki_page_template" -id_column "page_template_id" \ - -form ::xowiki::WikiForm - + -form ::xowiki::WikiForm + ::Generic::CrClass create PageInstance -superclass Page \ -pretty_name "XoWiki Page Instance" -pretty_plural "XoWiki Page Instances" \ -table_name "xowiki_page_instance" -id_column "page_instance_id" \ -cr_attributes { ::Generic::Attribute new -attribute_name page_template -datatype integer \ -pretty_name "Page Template" ::Generic::Attribute new -attribute_name instance_attributes -datatype text \ - -pretty_name "Instance Attributes" + -pretty_name "Instance Attributes" } \ -form ::xowiki::PageInstanceForm \ -edit_form ::xowiki::PageInstanceEditForm @@ -64,7 +64,7 @@ if {![db_0or1row check-xowiki-references-table \ "select tablename from pg_tables where tablename = 'xowiki_references'"]} { db_dml create-xowiki-references-table "create table xowiki_references( - reference integer references cr_items(item_id) on delete cascade, + reference integer references cr_items(item_id) on delete cascade, link_type text, page integer references cr_items(item_id) on delete cascade)" db_dml create-xowiki-references-index \ @@ -73,7 +73,7 @@ if {![db_0or1row check-xowiki-last-visited-table \ "select tablename from pg_tables where tablename = 'xowiki_last_visited'"]} { db_dml create-xowiki-last-visited-table "create table xowiki_last_visited( - page_id integer references cr_items(item_id) on delete cascade, + page_id integer references cr_items(item_id) on delete cascade, package_id integer, user_id integer, count integer, @@ -94,12 +94,12 @@ {-from_version_name:required} {-to_version_name:required} } { - - Callback for upgrading + Callback for upgrading + @author Gustaf Neumann (neumann@wu-wien.ac.at) } { - ns_log notice "-- UPGRADE $from_version_name -> $to_version_name" + ns_log notice "-- UPGRADE $from_version_name -> $to_version_name" if {$to_version_name eq "0.13"} { ns_log notice "-- upgrading to 0.13" @@ -157,7 +157,7 @@ db_1row refresh "select content_type__refresh_view('::xowiki::PageInstance') from dual" db_1row refresh "select content_type__refresh_view('::xowiki::Object') from dual" } - + if {[apm_version_names_compare $from_version_name "0.22"] == -1 && [apm_version_names_compare $to_version_name "0.22"] > -1} { ns_log notice "-- upgrading to 0.22" @@ -167,7 +167,7 @@ set folder_id [db_string get_folder_id "select f.folder_id from cr_items c, cr_folders f \ where c.name = 'xowiki: $package_id' and c.item_id = f.folder_id"] if {$folder_id ne ""} { - db_dml update_package_id {update cr_folders set package_id = :package_id + db_dml update_package_id {update cr_folders set package_id = :package_id where folder_id = :folder_id} lappend folder_ids $folder_id lappend package_ids $package_id @@ -185,31 +185,31 @@ Class create WikiForm -superclass ::Generic::Form \ -parameter { - {field_list {item_id title page_title creator text description nls_language}} - {f.item_id + {field_list {item_id title page_title creator text description nls_language}} + {f.item_id {item_id:key}} - {f.title + {f.title {title:text {label #xowiki.name#} {html {size 80}} }} {f.page_title {page_title:text {label #xowiki.title#} {html {size 80}} }} {f.creator {creator:text,optional {label #xowiki.creator#} {html {size 80}} }} - {f.text - {text:richtext(richtext),nospell,optional - {label #xowiki.content#} + {f.text + {text:richtext(richtext),nospell,optional + {label #xowiki.content#} {options {editor xinha plugins { GetHtml CharacterMap ContextMenu FullScreen ListType TableOperations EditTag LangMarks Abbreviation OacsFs } height 350px}} {html {rows 15 cols 50 style {width: 100%}}}} } - {f.description + {f.description {description:text,optional {label #xowiki.description#}} } - {f.nls_language - {nls_language:text(select),optional {label Language} + {f.nls_language + {nls_language:text(select),optional {label Language} {options \[xowiki::locales\]}}} - {validate + {validate {{title {\[::xowiki::validate_title\]} {Item with this name exists already}}}} {with_categories true} {submit_link "view"} @@ -220,7 +220,7 @@ set __fields "" foreach __field [my field_list] { set __spec [my set f.$__field] - if {[string first "richtext" [lindex $__spec 0]] > -1 + if {[string first "richtext" [lindex $__spec 0]] > -1 && [my folderspec] ne ""} { # we have a richtext widget. append the folder spec to its options set __newspec [list [lindex $__spec 0]] @@ -284,14 +284,14 @@ my instvar data array set __tmp [ns_set array [ns_getform]] if {[info exists __tmp(text.format)]} { - $data set mime_type $__tmp(text.format) + $data set mime_type $__tmp(text.format) } } WikiForm instproc update_references {} { my instvar data if {![my istype PageInstanceForm]} { - ### danger: update references does an ad_eval, which breaks the [template::adp_level] - ### ad_form! don't do it in pageinstanceforms. + ### danger: update references does an ad_eval, which breaks the [template::adp_level] + ### ad_form! don't do it in pageinstanceforms. $data render_adp false $data render -update_references } @@ -332,9 +332,9 @@ Class create PlainWikiForm -superclass WikiForm \ -parameter { - {f.text - {text:text(textarea),nospell,optional - {label #xowiki.content#} + {f.text + {text:text(textarea),nospell,optional + {label #xowiki.content#} {html {cols 80 rows 10}}}} } @@ -344,9 +344,9 @@ Class create ObjectForm -superclass PlainWikiForm \ -parameter { - {f.text - {text:text(textarea),nospell,optional - {label #xowiki.content#} + {f.text + {text:text(textarea),nospell,optional + {label #xowiki.content#} {html {cols 80 rows 15}}}} {with_categories false} } @@ -382,7 +382,7 @@ -privilege "admin" next } - + ObjectForm instproc edit_data {} { my instvar data $data set_payload [$data set text] @@ -395,9 +395,9 @@ Class create PageInstanceForm -superclass WikiForm \ -parameter { - {field_list {item_id title page_template description nls_language}} - {f.page_template - {page_template:text(select) + {field_list {item_id title page_template description nls_language}} + {f.page_template + {page_template:text(select) {label "Page Template"} {options \[xowiki::page_templates\]}} } @@ -407,7 +407,7 @@ my instvar folder_id data set __vars {folder_id item_id page_template} set object_type [[$data info class] object_type] - my log "-- data=$data cl=[$data info class] ot=$object_type" + my log "-- data=$data cl=[$data info class] ot=$object_type" set item_id [$data set item_id] set page_template [ns_set get [ns_getform] page_template] my submit_link [export_vars -base edit {folder_id object_type item_id page_template}] @@ -430,7 +430,7 @@ Class create PageInstanceEditForm -superclass WikiForm \ -parameter { - {field_list {item_id title page_title creator page_template description nls_language}} + {field_list {item_id title page_title creator page_template description nls_language}} {f.title {title:text(inform)}} {f.page_template {page_template:text(hidden)}} {f.nls_language {nls_language:text(hidden)}} @@ -441,8 +441,8 @@ PageInstanceEditForm instproc new_data {} { set __vars {folder_id item_id page_template} set object_type [[[my set data] info class] object_type] - my log "-- cl=[[my set data] info class] ot=$object_type" - foreach __v $__vars {set $__v [ns_queryget $__v]} + my log "-- cl=[[my set data] info class] ot=$object_type" + foreach __v $__vars {set $__v [ns_queryget $__v]} set item_id [next] my submit_link [export_vars -base edit $__vars] my log "-- submit_link = [my submit_link]" @@ -475,7 +475,7 @@ } PageInstanceEditForm instproc init {} { - my instvar data page_instance_form_atts + my instvar data page_instance_form_atts set item_id [ns_queryget item_id] set page_template [ns_queryget page_template] if {$page_template eq ""} { @@ -503,8 +503,8 @@ } } - + namespace eval ::xowiki { Page proc requireCSS name {set ::need_css($name) 1} @@ -541,7 +541,7 @@ Page proc pretty_link {-lang -package_id title} { my instvar url_prefix folder_id - + if {![info exists package_id]} {set package_id [$folder_id set package_id]} if {![info exists url_prefix($package_id)]} { set url_prefix($package_id) [site_node::get_url_from_object_id -object_id $package_id] @@ -620,8 +620,8 @@ # page instances have references to page templates, add these first if {[$o istype ::xowiki::PageInstance]} continue set item [CrItem lookup -title [$o set title] -parent_id $folder_id] - if {$item != 0 && $replace} { ;# we delete the original - ::Generic::CrItem delete -item_id $item + if {$item != 0 && $replace} { ;# we delete the original + ::Generic::CrItem delete -item_id $item set item 0 incr replaced } @@ -636,7 +636,7 @@ db_transaction { set item [CrItem lookup -title [$o set title] -parent_id $folder_id] if {$item != 0 && $replace} { ;# we delete the original - ::Generic::CrItem delete -item_id $item + ::Generic::CrItem delete -item_id $item set item 0 incr replaced } @@ -661,17 +661,17 @@ # Page parameter { - page_id + page_id {revision_id 0} - object_type - {folder_id -100} - {lang_links ""} + object_type + {folder_id -100} + {lang_links ""} {lang de} {render_adp 1} } Page set recursion_count 0 Page array set RE { - include {{{(.+)}}[ \n\r]*} + include {{{(.+)}}[ \n\r]*} anchor {\\\[\\\[([^\]]+)\\\]\\\]} div { *(
    *)?>>([^&]*)<<} } @@ -680,7 +680,7 @@ {render_adp 0} } PlainPage array set RE { - include {{{(.+)}}[ \n\r]} + include {{{(.+)}}[ \n\r]} anchor {\\\[\\\[([^\]]+)\\\]\\\]} div {()>>([^<]*)<<} } @@ -706,7 +706,7 @@ return $arg } set adp [string map {  " "} $adp] - set adp_fn [lindex $adp 0] + set adp_fn [lindex $adp 0] if {![string match "/*" $adp_fn]} {set adp_fn /packages/xowiki/www/$adp_fn} set adp_args [lindex $adp 1] if {[llength $adp_args] % 2 == 1} { @@ -739,8 +739,8 @@ if {[string match "http*//*" $link]} { return "$label" } - - my instvar parent_id + + my instvar parent_id # do we have a language link (it starts with a ':') if {[regexp {^:(..):(.*)$} $link _ lang stripped_name]} { set link_type language @@ -765,7 +765,7 @@ } Page instproc references {} { - [my info class] instvar table_name + [my info class] instvar table_name my instvar item_id set refs [list] db_foreach references "SELECT page,ci.name,link_type,f.package_id \ @@ -906,7 +906,7 @@ # PageInstance instproc get_field_type {name template default_spec} { - # get the widget field specifications from the payload of the folder object + # get the widget field specifications from the payload of the folder object # for a field with a specified name in a specified page template set spec $default_spec foreach {s widget} [[my set parent_id] get_payload widget_specs] { @@ -963,7 +963,7 @@ return "
    [string map {> > < <} [my set text]]
    " } } - + Object instproc initialize_loaded_object {} { my set_payload [my set text] next Index: openacs-4/packages/xowiki/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/index.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/xowiki/www/index.adp 30 Dec 2005 00:09:58 -0000 1.2 +++ openacs-4/packages/xowiki/www/index.adp 18 Apr 2006 00:06:14 -0000 1.3 @@ -2,8 +2,7 @@ @page_title;noquote@ @context;noquote@ -Site-Wide Categories +Site-Wide Categories @t1;noquote@ Index: openacs-4/packages/xowiki/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/xowiki/www/admin/index.adp 28 Jan 2006 23:28:23 -0000 1.2 +++ openacs-4/packages/xowiki/www/admin/index.adp 18 Apr 2006 00:06:14 -0000 1.3 @@ -1,6 +1,7 @@ @page_title;noquote@ @context;noquote@ +Site-Wide Categories @t1;noquote@ Index: openacs-4/packages/xowiki/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/xowiki/www/admin/index.tcl 12 Feb 2006 01:21:38 -0000 1.7 +++ openacs-4/packages/xowiki/www/admin/index.tcl 18 Apr 2006 00:06:14 -0000 1.8 @@ -46,3 +46,9 @@ } set t1 [t1 asHTML] + +# set up categories +set package_id [ad_conn package_id] +set category_map_url [export_vars -base \ + [site_node::get_package_url -package_key categories]cadmin/one-object \ + { { object_id $package_id } }] \ No newline at end of file Index: openacs-4/packages/xowiki/www/portlets/categories-recent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories-recent.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/portlets/categories-recent.tcl 25 Feb 2006 13:36:24 -0000 1.3 +++ openacs-4/packages/xowiki/www/portlets/categories-recent.tcl 18 Apr 2006 00:06:14 -0000 1.4 @@ -11,7 +11,7 @@ # get the folder id from the including page set folder_id [$__including_page set parent_id] set package_id [$folder_id set package_id] -set cattree [::xowiki::CatTree new -volatile] +set cattree [::xowiki::CatTree new -volatile -name "categories-recent"] ## provide also a three level display with tree names? @@ -37,9 +37,16 @@ " { if {$page_title eq ""} {set page_title $title} set itemobj [Object new] - set prefix $publish_date - foreach var {title page_title prefix} {$itemobj set $var [set $var]} - $cattree add_to_category -category_id $category_id -itemobj $itemobj + set prefix "$publish_date " + set suffix "" + foreach var {title page_title prefix suffix} {$itemobj set $var [set $var]} + if {![info exists categories($category_id)]} { + set categories($category_id) [::xowiki::Category new \ + -label [category::get_name $category_id]\ + -level 1] + $cattree add $categories($category_id) + } + $cattree add_to_category -category $categories($category_id) -itemobj $itemobj } set content [$cattree render] Index: openacs-4/packages/xowiki/www/portlets/categories.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/xowiki/www/portlets/categories.tcl 3 Mar 2006 18:58:16 -0000 1.9 +++ openacs-4/packages/xowiki/www/portlets/categories.tcl 18 Apr 2006 00:06:14 -0000 1.10 @@ -18,7 +18,6 @@ if {![info exists tree_style]} {set tree_style 1} if {![info exists plain_include]} {set plain_include 0} -set renderer [expr {$tree_style ? "render-li" : "render"}] set content "" foreach tree [category_tree::get_mapped_trees $package_id] { @@ -29,12 +28,19 @@ } set categories [list] set pos 0 - foreach category [category_tree::get_tree $tree_id] { - foreach {category_id category_label deprecated_p level} $category {break} - set order($category_id) [incr pos] + set cattree(0) [::xowiki::CatTree new -volatile -orderby pos -name $my_tree_name] + set lastlevel 0 + foreach category_info [category_tree::get_tree $tree_id] { + foreach {category_id category_label deprecated_p level} $category_info {break} + set c [::xowiki::Category new -orderby pos -category_id $category_id \ + -level $level -label $category_label -pos [incr pos]] + set cattree($level) $c + set plevel [expr {$level -1}] + $cattree($plevel) add $c + set category($category_id) $c lappend categories $category_id } - set cattree [::xowiki::CatTree new -volatile -order_items_by page_title] + db_foreach get_pages \ "select i.item_id, r.title, i.content_type, p.page_title, category_id \ from category_object_map c, cr_items i, cr_revisions r, xowiki_page p \ @@ -47,15 +53,15 @@ if {$page_title eq ""} {set page_title $title} set itemobj [Object new] set prefix "" - foreach var {title page_title prefix} {$itemobj set $var [set $var]} - $cattree add_to_category \ - -category_id $category_id \ + set suffix "" + foreach var {title page_title prefix suffix} {$itemobj set $var [set $var]} + $cattree(0) add_to_category \ + -category $category($category_id) \ -itemobj $itemobj \ - -pos $order($category_id) \ + -orderby title \ -open_item [expr {$item_id == $open_item_id}] } - $cattree orderby pos - append content [$cattree $renderer] + append content [$cattree(0) render -tree_style $tree_style] } if {[info exists skin]} { Index: openacs-4/packages/xowiki/www/portlets/last-visited.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/last-visited.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/portlets/last-visited.tcl 13 Apr 2006 19:19:37 -0000 1.1 +++ openacs-4/packages/xowiki/www/portlets/last-visited.tcl 18 Apr 2006 00:06:14 -0000 1.2 @@ -27,7 +27,6 @@ r.revision_id = p.page_id and x.user_id = $user_id and x.package_id = $package_id order by x.time desc limit $max_entries " { -ns_log notice "-- GOT $page_title" if {$page_title eq ""} {set page_title $title} t1 add \ Index: openacs-4/packages/xowiki/www/resources/cattree.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/cattree.css,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/resources/cattree.css 18 Apr 2006 00:06:15 -0000 1.1 @@ -0,0 +1,39 @@ +/* Put this inside a @media qualifier so Netscape 4 ignores it */ +@media screen { + /* Turn off list bullets */ + ul.mktree li { list-style: none; } + /* Control how "spaced out" the tree is */ + ul.mktree, ul.mktree ul , ul.mktree li { margin-left:1px; } + /* Provide space for our own "bullet" inside the LI */ + ul.mktree li .bullet { padding-left: 15px; } + /* Show "bullets" in the links, depending on the class of the LI that the link's in */ + ul.mktree li.liOpen .bullet { cursor: pointer; background: url(/resources/acs-templating/minus.gif) center left no-repeat; } + ul.mktree li.liClosed .bullet { cursor: pointer; background: url(/resources/acs-templating/plus.gif) center left no-repeat; } + ul.mktree li.liBullet .bullet { cursor: default; background: url(/resources/acs-templating/bullet.gif) center left no-repeat; } + /* Sublists are visible or not based on class of parent LI */ + ul.mktree li.liOpen ul { display: block; } + ul.mktree li.liClosed ul { display: none; } + /* Format menu items differently depending on what level of the tree they are in + ul.mktree li { font-size: 12pt; } + ul.mktree li ul li { font-size: 10pt; } + ul.mktree li ul li ul li { font-size: 8pt; } + ul.mktree ul li ul li ul li li { font-size: 6pt; } + */ + + ul.mktree ul li { list-style: none; } + ul.mktree ul li ul li { list-style: none; } + + .portlet ul.mktree { + list-style:none; + list-style-position:outside; + padding-top:0px; + display: inline; } + + .portlet ul.mktree li { + margin-left: 0px; + padding-left: 10px; + background: none; + padding-top:0px; } + +} +