lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2010-03-02 12:15:02 -08:00
parent 49a9c6cc98 b46636c975
commit 53dbf86760
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
View File

@@ -7,8 +7,10 @@
foreach (var entry in Model.Roles) {%> foreach (var entry in Model.Roles) {%>
<%=Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%> <%=Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%>
<%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%> <%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
<div>
<%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> <%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%>
<label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%=Html.Encode(entry.Name) %></label> <label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%=Html.Encode(entry.Name) %></label>
</div>
<%++index; <%++index;
} }
} }

2
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx
View File

@@ -9,6 +9,6 @@
<%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %> <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
<%=Html.EditorForItem(Model.User) %> <%=Html.EditorForItem(Model.User) %>
<fieldset> <fieldset>
<input class="button" type="submit" value="<%=_Encoded("Create") %>" /> <input class="button primaryAction" type="submit" value="<%=_Encoded("Create") %>" />
</fieldset> </fieldset>
<% } %> <% } %>

2
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
<fieldset> <fieldset>
<%=Html.LabelForModel() %> <%=Html.LabelForModel() %>
<%=Html.Password("", Model, new { @class = "text" }) %> <%=Html.Password("", Model, new { @class = "textMedium" })%>
<%=Html.ValidationMessage("", "*") %> <%=Html.ValidationMessage("", "*") %>
</fieldset> </fieldset>

2
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
<fieldset> <fieldset>
<%=Html.LabelForModel() %> <%=Html.LabelForModel() %>
<%=Html.TextBox("", Model, new { @class = "text" }) %> <%=Html.TextBox("", Model, new { @class = "textMedium" })%>
<%=Html.ValidationMessage("", "*") %> <%=Html.ValidationMessage("", "*") %>
</fieldset> </fieldset>

6
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion> <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid> <ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids> <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -174,6 +174,7 @@
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" /> <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" /> <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" /> <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Items\Pages.Page.ascx" />
<Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" /> <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
<Content Include="Themes\Classic\Views\Footer.ascx" /> <Content Include="Themes\Classic\Views\Footer.ascx" />
<Content Include="Themes\Classic\Views\Layout.ascx" /> <Content Include="Themes\Classic\Views\Layout.ascx" />
@@ -255,9 +256,6 @@
<IISUrl> <IISUrl>
</IISUrl> </IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>

8
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -384,13 +384,16 @@ label input {
text-indent:3ex; /* todo: (heskew) this might look out of place */ text-indent:3ex; /* todo: (heskew) this might look out of place */
} }
/* todo: (heskew) try to get .text on stuff like .text-box */ /* todo: (heskew) try to get .text on stuff like .text-box */
select, textarea, input.text, input.text-box { select, textarea, input.text, input.textMedium, input.text-box {
padding:2px; padding:2px;
border:1px solid #bdbcbc; border:1px solid #bdbcbc;
} }
input.text, input.text-box { input.text, input.textMedium, input.text-box {
line-height:1.2em; line-height:1.2em;
} }
input.textMedium {
width:26em;
}
select:focus, textarea:focus, input.text:focus, input.text-box:focus { select:focus, textarea:focus, input.text:focus, input.text-box:focus {
border-color:#666d51; border-color:#666d51;
} }
@@ -428,6 +431,7 @@ fieldset {
.settings legend { .settings legend {
margin:0 0 -.4em 0; margin:0 0 -.4em 0;
} }
/* todo: This style is the same as textMedium. Consolidate if possible */
.settings input.text, .settings input.text-box { .settings input.text, .settings input.text-box {
width:26em; width:26em;
} }