Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [293] Website/Includes
|
From: <m_h...@us...> - 2006-08-09 23:01:09
|
Revision: 293 Author: m_hildebrand Date: 2006-08-09 16:00:54 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=293&view=rev Log Message: ----------- More CSS changes Worked on the main administration page layout Modified Paths: -------------- Website/App_Themes/Python/Python.skin Website/App_Themes/Python/python.css Website/Includes/Administration.ascx Website/Includes/Administration.ascx.cs Website/Includes/UserSettings.ascx Website/Includes/UserSettings.ascx.cs Added Paths: ----------- Website/App_Themes/Python/Images/product_delete_48.png Website/App_Themes/Python/Images/product_edit_48.png Website/App_Themes/Python/Images/product_view_48.png Website/App_Themes/Python/Images/user_delete_48.png Website/App_Themes/Python/Images/user_edit_48.png Website/App_Themes/Python/Images/user_view_48.png Added: Website/App_Themes/Python/Images/product_delete_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/product_delete_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: Website/App_Themes/Python/Images/product_edit_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/product_edit_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: Website/App_Themes/Python/Images/product_view_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/product_view_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: Website/App_Themes/Python/Images/user_delete_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/user_delete_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: Website/App_Themes/Python/Images/user_edit_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/user_edit_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: Website/App_Themes/Python/Images/user_view_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/user_view_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: Website/App_Themes/Python/Python.skin =================================================================== --- Website/App_Themes/Python/Python.skin 2006-08-09 21:13:16 UTC (rev 292) +++ Website/App_Themes/Python/Python.skin 2006-08-09 23:00:54 UTC (rev 293) @@ -22,8 +22,16 @@ --%> <asp:GridView runat="server" SkinId="assignments" Width="100%" /> <asp:Image runat="server" SkinId="newUserImage" ImageUrl="Images/user_add_48.png" /> +<asp:Image runat="server" SkinId="viewUserImage" ImageUrl="Images/user_view_48.png" /> +<asp:Image runat="server" SkinId="editUserImage" ImageUrl="Images/user_edit_48.png" /> +<asp:Image runat="server" SkinId="deleteUserImage" ImageUrl="Images/user_delete_48.png" /> <asp:Image runat="server" SkinId="userRoleImage" ImageUrl="Images/user_role_48.png" /> + <asp:Image runat="server" SkinId="newProductImage" ImageUrl="Images/product_add_48.png" /> +<asp:Image runat="server" SkinId="editProductImage" ImageUrl="Images/product_edit_48.png" /> +<asp:Image runat="server" SkinId="viewProductImage" ImageUrl="Images/product_view_48.png" /> +<asp:Image runat="server" SkinId="deleteProductImage" ImageUrl="Images/product_delete_48.png" /> + <asp:Image runat="server" SkinId="priority_high_small" ImageUrl="Images/priority_high_small.png" /> <asp:Image runat="server" SkinId="priority_high_large" ImageUrl="Images/priority_high_large.png" /> <asp:Image runat="server" SkinId="priority_normal_small" ImageUrl="" /> Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-08-09 21:13:16 UTC (rev 292) +++ Website/App_Themes/Python/python.css 2006-08-09 23:00:54 UTC (rev 293) @@ -128,40 +128,6 @@ list-style-type: circle; } -.button -{ - display: inline; - position: relative; - top: 15px; - left: -20px; - z-index: 50; -} - -.button LABEL -{ - position: relative; - left: -30px; - top: 3px; - text-decoration: none; -} - -.button A -{ - text-decoration: none; - font-weight: bold; -} - - -.button IMG -{ - /*display: block;*/ - border: none; - position: relative; - left: 30px; - top: -3px; - z-index: -10; -} - .motd { margin: 10px 0 0 10px; @@ -183,12 +149,6 @@ text-indent: -5em } -.pictureMenu -{ - text-align: center; - z-index: 100; -} - /********** END Global Classes **********/ /********** BEGIN Calendar Classes **********/ @@ -454,7 +414,68 @@ } /********** END Notes Box Content **********/ +/********* BEGIN Administration Menu Content *********/ +#Administration, #Administration LABEL +{ + margin-left: 20px; +} +#Administration .menu +{ + display: block; + margin: 15px; + float: left; + clear: left; +} + +.pictureMenu +{ + margin: 0; + text-align: left; + z-index: 100; +} + +.button +{ + float: left; + position: relative; + z-index: 50; + margin: 5px 0 5px -20px; +} + +.button A +{ + text-decoration: none; + font-weight: bold; +} + +.button IMG +{ + border: none; + position: relative; + left: 30px; + top: -3px; + z-index: -10; +} + +.pictureMenu .xb2, .pictureMenu .xb3, .pictureMenu .xb4 +{ + background-color: Transparent; + border-left-color: #022E66; + border-right-color: #022E66; +} + +.pictureMenu .xb1 +{ + background-color: #022E66; +} + +.pictureMenu .xboxcontent +{ + background-color: Transparent; + border-color: #022E66; +} +/********** END Picture Menu Content **********/ /********** BEGIN Page Content **********/ #TreeContent { Modified: Website/Includes/Administration.ascx =================================================================== --- Website/Includes/Administration.ascx 2006-08-09 21:13:16 UTC (rev 292) +++ Website/Includes/Administration.ascx 2006-08-09 23:00:54 UTC (rev 293) @@ -1,17 +1,107 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="Administration.ascx.cs" Inherits="TCDB.Administration" %> - -<div class="pictureMenu"> - <div class="button"> - <asp:LinkButton ID="newProduct" runat="server" PostBackUrl="~/Product.aspx?mode=new" OnInit="newProduct_Init" > - <asp:Image ID="newProductIcon" runat="server" SkinID="newProductImage" AlternateText="New Product" />New - Product</asp:LinkButton> +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="Administration.ascx.cs" + Inherits="TCDB.Administration" %> +<!-- TODO: make these pull-downs dynamic --> +<div id="Administration"> + <div class="menu"> + <label> + Product Administration</label> + <div class="pictureMenu" id="ProductAdmin"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <div class="button"> + <asp:LinkButton ID="newProduct" runat="server" PostBackUrl="~/Product.aspx?mode=new" + OnInit="newProduct_Init"> + <asp:Image ID="newProductIcon" runat="server" SkinID="newProductImage" AlternateText="New Product" />New + Product</asp:LinkButton> + </div> + <div class="end"> + </div> + <div class="hr"> + </div> + <div class="pulldown"> + <label> + For:</label> + <asp:DropDownList runat="server" ID="testing"> + <asp:ListItem Text="Quest management Xtensions for MOM" Value="1"></asp:ListItem> + </asp:DropDownList> + </div> + <div class="button"> + <asp:LinkButton ID="viewProduct" runat="server" PostBackUrl="~/Product.aspx?mode=view" + OnInit="viewProduct_Init"> + <asp:Image ID="viewProductIcon" runat="server" SkinID="newProductImage" AlternateText="Edit Product" />View + Product</asp:LinkButton> + </div> + <div class="button"> + <asp:LinkButton ID="editProduct" runat="server" PostBackUrl="~/Product.aspx?mode=edit" + OnInit="editProduct_Init"> + <asp:Image ID="editProductIcon" runat="server" SkinID="editProductImage" AlternateText="Edit Product" />Edit + Product</asp:LinkButton> + </div> + <div class="button"> + <asp:LinkButton ID="deleteProduct" runat="server" PostBackUrl="~/Product.aspx?mode=delete" + OnInit="deleteProduct_Init"> + <asp:Image ID="deleteProductIcon" runat="server" SkinID="deleteProductImage" AlternateText="Edit Product" />Delete + Product</asp:LinkButton> + </div> + <div class="end"> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b></b> + <b class="xb1"></b> + </div> </div> - <div class="button"> - <asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new" OnInit="newUser_Init" > - <asp:Image ID="newUserIcon" runat="server" SkinID="newUserImage" AlternateText="New User" />New - User</asp:LinkButton></div> - <div class="button"> - <asp:LinkButton ID="userRole" runat="server" PostBackUrl="~/AdminRole.aspx" OnInit="userRole_Init"> - <asp:Image ID="userRoleIcon" runat="server" SkinID="userRoleImage" AlternateText="User Roles" />User - Roles</asp:LinkButton></div> </div> + <div class="menu"> + <label> + User Administration</label> + <div class="pictureMenu" id="UserAdmin"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <div class="button"> + <asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new" + OnInit="newUser_Init"> + <asp:Image ID="newUserIcon" runat="server" SkinID="newUserImage" AlternateText="New User" />New + User</asp:LinkButton></div> + <div class="button"> + <asp:LinkButton ID="userRole" runat="server" PostBackUrl="~/AdminRole.aspx" OnInit="userRole_Init"> + <asp:Image ID="userRoleIcon" runat="server" SkinID="userRoleImage" AlternateText="User Roles" />User + Roles</asp:LinkButton></div> + <div class="end"> + </div> + <div class="hr"> + </div> + <div class="pulldown"> + <label> + For:</label> + <asp:DropDownList runat="server" ID="DropDownList1"> + <asp:ListItem Text="Matthew Hildebrand" Value="1"></asp:ListItem> + </asp:DropDownList> + </div> + <div class="button"> + <asp:LinkButton ID="userView" runat="server" PostBackUrl="~/UserSettings.aspx?mode=view" + OnInit="viewUser_Init"> + <asp:Image ID="userViewIcon" runat="server" SkinID="viewUserImage" AlternateText="View User" />View + User</asp:LinkButton></div> + <div class="button"> + <asp:LinkButton ID="userEdit" runat="server" PostBackUrl="~/UserSettings.aspx?mode=edit" + OnInit="editUser_Init"> + <asp:Image ID="userEditIcon" runat="server" SkinID="editUserImage" AlternateText="Edit User" />Edit + User</asp:LinkButton></div> + <div class="button"> + <asp:LinkButton ID="userDelete" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new" + OnInit="deleteUser_Init"> + <asp:Image ID="userDeleteIcon" runat="server" SkinID="deleteUserImage" AlternateText="Delete User" />Delete + User</asp:LinkButton></div> + <div class="end"> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b></b> + <b class="xb1"></b> + </div> + </div> + </div> +</div> Modified: Website/Includes/Administration.ascx.cs =================================================================== --- Website/Includes/Administration.ascx.cs 2006-08-09 21:13:16 UTC (rev 292) +++ Website/Includes/Administration.ascx.cs 2006-08-09 23:00:54 UTC (rev 293) @@ -21,6 +21,7 @@ { m_logg.Debug("Loading Administration page"); } + protected void newUser_Init(object sender, EventArgs e) { LinkButton newUser = (LinkButton)sender; @@ -28,6 +29,31 @@ if (!m_user.HasRight("create_user", Constants.PRODUCT_ANYID)) newUser.Visible = false; } + + protected void viewUser_Init(object sender, EventArgs e) + { + LinkButton viewUser = (LinkButton)sender; + + if (!m_user.HasRight("view_user", Constants.PRODUCT_ANYID)) + viewUser.Visible = false; + } + + protected void editUser_Init(object sender, EventArgs e) + { + LinkButton editUser = (LinkButton)sender; + + if (!m_user.HasRight("edit_user", Constants.PRODUCT_ANYID)) + editUser.Visible = false; + } + + protected void deleteUser_Init(object sender, EventArgs e) + { + LinkButton deleteUser = (LinkButton)sender; + + if (!m_user.HasRight("delete_user", Constants.PRODUCT_ANYID)) + deleteUser.Visible = false; + } + protected void userRole_Init(object sender, EventArgs e) { LinkButton seeRoles = (LinkButton)sender; @@ -35,6 +61,7 @@ if (!m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID) && !m_user.HasRight("view_other_roles", Constants.PRODUCT_ANYID)) seeRoles.Visible = false; } + protected void newProduct_Init(object sender, EventArgs e) { LinkButton newProduct = (LinkButton)sender; @@ -42,5 +69,29 @@ if (!m_user.HasRight("create_product", Constants.PRODUCT_ANYID)) newProduct.Visible = false; } + + protected void editProduct_Init(object sender, EventArgs e) + { + LinkButton editProduct = (LinkButton)sender; + + if (!m_user.HasRight("edit_product", Constants.PRODUCT_ANYID)) + editProduct.Visible = false; + } + + protected void viewProduct_Init(object sender, EventArgs e) + { + LinkButton viewProduct = (LinkButton)sender; + + if (!m_user.HasRight("view_product", Constants.PRODUCT_ANYID)) + viewProduct.Visible = false; + } + + protected void deleteProduct_Init(object sender, EventArgs e) + { + LinkButton deleteProduct = (LinkButton)sender; + + if (!m_user.HasRight("delete_product", Constants.PRODUCT_ANYID)) + deleteProduct.Visible = false; + } } } \ No newline at end of file Modified: Website/Includes/UserSettings.ascx =================================================================== --- Website/Includes/UserSettings.ascx 2006-08-09 21:13:16 UTC (rev 292) +++ Website/Includes/UserSettings.ascx 2006-08-09 23:00:54 UTC (rev 293) @@ -207,9 +207,9 @@ | <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" /> | - <asp:LinkButton ID="sync" runat="server" Text="Sync with AD" OnCommand="SyncWithAD" /> + <asp:LinkButton ID="sync" runat="server" Text="Sync from AD" OnCommand="SyncFromAD" /> - <asp:Label ID="passwordLbl" runat="server" Text="Password: "></asp:Label><asp:TextBox + <asp:Label ID="passwordLbl" runat="server" Text="Your AD Password: "></asp:Label><asp:TextBox ID="passwordBox" runat="server" TextMode="Password"></asp:TextBox> </div> <div class="right"> @@ -309,9 +309,9 @@ | <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" /> | - <asp:LinkButton ID="sync" runat="server" Text="Sync with AD" OnCommand="SyncWithAD" /> + <asp:LinkButton ID="sync" runat="server" Text="Sync from AD" OnCommand="SyncFromAD" /> - <asp:Label ID="passwordLbl" runat="server" Text="Password: "></asp:Label><asp:TextBox + <asp:Label ID="passwordLbl" runat="server" Text="Your AD Password: "></asp:Label><asp:TextBox ID="passwordBox" runat="server" TextMode="Password"></asp:TextBox> </div> <div class="right"> Modified: Website/Includes/UserSettings.ascx.cs =================================================================== --- Website/Includes/UserSettings.ascx.cs 2006-08-09 21:13:16 UTC (rev 292) +++ Website/Includes/UserSettings.ascx.cs 2006-08-09 23:00:54 UTC (rev 293) @@ -197,7 +197,7 @@ m_user.ClearRights(); } - protected void SyncWithAD(object sender, CommandEventArgs e) + protected void SyncFromAD(object sender, CommandEventArgs e) { TextBox passwordBox = (TextBox)UserSettingsView.FindControl("passwordBox"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
