Author: krasnov
Date: 2006-07-24 07:16:16 -0400 (Mon, 24 Jul 2006)
New Revision: 62911
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
Log:
* Menu.cs: fixed properties default values, fixed rendering SkipLinkText
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-07-24 10:50:58 UTC (rev 62910)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-07-24 11:16:16 UTC (rev 62911)
@@ -1,3 +1,8 @@
+2006-07-24 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * Menu.cs: fixed properties default values, fixed rendering
+ SkipLinkText
+
2006-07-23 Vladimir Krasnov <[EMAIL PROTECTED]>
* Wizard.cs: implemented SkipLinkText, TagKey
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2006-07-24 10:50:58 UTC (rev 62910)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2006-07-24 11:16:16 UTC (rev 62911)
@@ -545,8 +545,8 @@
public string ScrollDownText {
get {
object o = ViewState ["ScrollDownText"];
- if (o != null) return (string) o;
- return "";
+ if (o != null) return (string) o;
+ return Locale.GetText ("Scroll down");
}
set {
ViewState["ScrollDownText"] = value;
@@ -557,8 +557,8 @@
public string ScrollUpText {
get {
object o = ViewState ["ScrollUpText"];
- if (o != null) return (string) o;
- return "";
+ if (o != null) return (string) o;
+ return Locale.GetText ("Scroll up");
}
set {
ViewState["ScrollUpText"] = value;
@@ -567,13 +567,17 @@
[MonoTODO]
public string DynamicPopOutImageTextFormatString
- {
- get {
- throw new NotImplementedException ();
- }
- set {
- throw new NotImplementedException ();
- }
+ {
+ get
+ {
+ object o = ViewState ["dpoitf"];
+ if (o != null) return (string) o;
+ return Locale.GetText ("Expand {0}");
+ }
+ set
+ {
+ ViewState ["dpoitf"] = value;
+ }
}
@@ -593,13 +597,17 @@
[MonoTODO]
public string StaticPopOutImageTextFormatString
- {
- get {
- throw new NotImplementedException ();
- }
- set {
- throw new NotImplementedException ();
- }
+ {
+ get
+ {
+ object o = ViewState ["spoitf"];
+ if (o != null) return (string) o;
+ return Locale.GetText ("Expand {0}");
+ }
+ set
+ {
+ ViewState ["spoitf"] = value;
+ }
}
@@ -663,7 +671,7 @@
[DefaultValue ("")]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public string SelectedValue {
- get { return selectedItem != null ? selectedItem.Value
: null; }
+ get { return selectedItem != null ? selectedItem.Value
: ""; }
}
[MonoTODO]
@@ -674,7 +682,7 @@
object o = ViewState ["SkipLinkText"];
if (o != null)
return (string) o;
- return String.Empty;
+ return "Skip Navigation Links";
}
set {
ViewState ["SkipLinkText"] = value;
@@ -1047,8 +1055,9 @@
}
protected internal override void Render (HtmlTextWriter writer)
- {
- base.Render (writer);
+ {
+ if (Items.Count > 0)
+ base.Render (writer);
}
protected override void AddAttributesToRender (HtmlTextWriter
writer)
@@ -1057,7 +1066,21 @@
}
public override void RenderBeginTag (HtmlTextWriter writer)
- {
+ {
+ if (SkipLinkText != "") {
+ System.Web.UI.HtmlControls.HtmlAnchor anchor =
new System.Web.UI.HtmlControls.HtmlAnchor ();
+ anchor.HRef = "#" + ClientID + "_SkipLink";
+
+ Image img = new Image ();
+ ClientScriptManager csm = new
ClientScriptManager (null);
+ img.ImageUrl = csm.GetWebResourceUrl (typeof
(SiteMapPath), "transparent.gif");
+ img.Attributes.Add ("height", "0");
+ img.Attributes.Add ("width", "0");
+ img.AlternateText = SkipLinkText;
+
+ anchor.Controls.Add (img);
+ anchor.Render (writer);
+ }
base.RenderBeginTag (writer);
}
@@ -1070,11 +1093,17 @@
MenuItem item = (MenuItem) dynamicMenus [n];
RenderDynamicMenu (writer, item);
}
- dynamicMenus = null;
+ dynamicMenus = null;
+
+ if (SkipLinkText != "") {
+ System.Web.UI.HtmlControls.HtmlAnchor anchor =
new System.Web.UI.HtmlControls.HtmlAnchor ();
+ anchor.ID = "SkipLink";
+ anchor.Render (writer);
+ }
}
protected internal override void RenderContents (HtmlTextWriter
writer)
- {
+ {
dynamicMenus = new ArrayList ();
RenderMenuBody (writer, Items, Orientation ==
Orientation.Vertical, false);
}
@@ -1139,7 +1168,8 @@
void RenderMenuBeginTagAttributes (HtmlTextWriter writer, bool
dynamic, int menuLevel)
{
writer.AddAttribute ("cellpadding", "0");
- writer.AddAttribute ("cellspacing", "0");
+ writer.AddAttribute ("cellspacing", "0");
+ writer.AddAttribute ("border", "0");
string cls = menuLevel==0 ? ControlStyle.CssClass :
string.Empty;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
