mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-14 10:54:50 +08:00
Some post initial themeing work housekeeping
--HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044245
This commit is contained in:
skewed
@@ -1,662 +0,0 @@
|
||||
/* begin: reset
|
||||
todo: (heskew) pare down and combine with existing selectors where appropriate */
|
||||
/* http://meyerweb.com/eric/tools/css/reset/ */
|
||||
/* v1.0 | 20080212 */
|
||||
html, body, div, span, applet, object, iframe,
|
||||
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
||||
a, abbr, acronym, address, big, cite, code,
|
||||
del, dfn, em, font, img, ins, kbd, q, s, samp,
|
||||
small, strike, strong, sub, sup, tt, var,
|
||||
b, u, i, center,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td {
|
||||
border:0;
|
||||
font-size:100%;
|
||||
margin:0;
|
||||
padding:0;
|
||||
vertical-align:baseline;
|
||||
}
|
||||
ol, ul {
|
||||
list-style:none;
|
||||
}
|
||||
blockquote, q {
|
||||
quotes:none;
|
||||
}
|
||||
blockquote:before, blockquote:after,
|
||||
q:before, q:after {
|
||||
content:'';
|
||||
content:none;
|
||||
}
|
||||
ins {
|
||||
text-decoration:none;
|
||||
}
|
||||
del {
|
||||
text-decoration:line-through;
|
||||
}
|
||||
table {
|
||||
border-collapse:collapse;
|
||||
border-spacing:0;
|
||||
}
|
||||
/* end: reset */
|
||||
|
||||
|
||||
/* Base setup
|
||||
----------------------------------------------------------*/
|
||||
html {
|
||||
background:#8a8f7a;
|
||||
color:#525e50;
|
||||
}
|
||||
body {
|
||||
color:#5a5b32;
|
||||
font-family:Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size:62.5%; /* 10px */
|
||||
line-height:1.6em;
|
||||
margin:0 auto 1em;
|
||||
min-width:94.6em; /* 946px */
|
||||
padding:0 .4em;
|
||||
}
|
||||
body#preview {
|
||||
min-width:0;
|
||||
}
|
||||
#content {
|
||||
background:#f9faf5;
|
||||
}
|
||||
|
||||
|
||||
/* Layout
|
||||
|
||||
number of columns: 24; actual width: 946; column width: 26; gutter width:14
|
||||
|
||||
| 24| 23| 22| 21| 20| 19| 18| 17| 16| 15| 14| 13| 12| 11| 10| 9| 8| 7| 6| 5| 4| 3| 2
|
||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
.5g| 0.759| 0.793| 0.829| 0.870| 0.914| 0.963| 1.017| 1.079| 1.148| 1.226| 1.316| 1.420| 1.542| 1.687| 1.862| 2.077| 2.349| 2.703| 3.182| 3.867| 4.930| 6.796| 10.938
|
||||
24|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
23| 95.770|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
22| 91.540| 95.583|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
21| 87.310| 91.166| 95.379|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
20| 83.080| 86.750| 90.758| 95.155|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
19| 78.850| 82.333| 86.137| 90.311| 94.909|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
18| 74.620| 77.916| 81.517| 85.466| 89.817| 94.635|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
17| 70.390| 73.499| 76.896| 80.621| 84.726| 89.271| 94.331|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
16| 66.161| 69.083| 72.275| 75.776| 79.634| 83.906| 88.663| 93.991|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
15| 61.931| 64.666| 67.654| 70.932| 74.543| 78.542| 82.994| 87.982| 93.607|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
14| 57.701| 60.249| 63.033| 66.087| 69.452| 73.177| 77.326| 81.972| 87.213| 93.170|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
13| 53.471| 55.832| 58.412| 61.242| 64.360| 67.813| 71.657| 75.963| 80.820| 86.340| 92.669|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
12| 49.241| 51.416| 53.791| 56.398| 59.269| 62.448| 65.988| 69.954| 74.426| 79.510| 85.338| 92.089|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
11| 45.011| 46.999| 49.171| 51.553| 54.178| 57.084| 60.320| 63.945| 68.033| 72.680| 78.008| 84.178| 91.410|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
10| 40.781| 42.582| 44.550| 46.708| 49.086| 51.719| 54.651| 57.935| 61.639| 65.849| 70.677| 76.268| 82.819| 90.602|100.000| ---| ---| ---| ---| ---| ---| ---| ---
|
||||
9| 36.551| 38.165| 39.929| 41.863| 43.995| 46.355| 48.983| 51.926| 55.246| 59.019| 63.346| 68.357| 74.229| 81.205| 89.628|100.000| ---| ---| ---| ---| ---| ---| ---
|
||||
8| 32.321| 33.749| 35.308| 37.019| 38.903| 40.990| 43.314| 45.917| 48.852| 52.189| 56.015| 60.446| 65.639| 71.807| 79.255| 88.427|100.000| ---| ---| ---| ---| ---| ---
|
||||
7| 28.091| 29.332| 30.687| 32.174| 33.812| 35.626| 37.645| 39.908| 42.459| 45.359| 48.684| 52.535| 57.048| 62.410| 68.883| 76.855| 86.913|100.000| ---| ---| ---| ---| ---
|
||||
6| 23.861| 24.915| 26.066| 27.329| 28.721| 30.261| 31.977| 33.898| 36.066| 38.529| 41.353| 44.625| 48.458| 53.012| 58.511| 65.282| 73.826| 84.942|100.000| ---| ---| ---| ---
|
||||
5| 19.631| 20.498| 21.445| 22.484| 23.629| 24.897| 26.308| 27.889| 29.672| 31.699| 34.023| 36.714| 39.868| 43.614| 48.138| 53.709| 60.738| 69.884| 82.273|100.000| ---| ---| ---
|
||||
4| 15.401| 16.082| 16.825| 17.640| 18.538| 19.532| 20.640| 21.880| 23.279| 24.869| 26.692| 28.803| 31.278| 34.217| 37.766| 42.136| 47.651| 54.826| 64.545| 78.453|100.000| ---| ---
|
||||
3| 11.171| 11.665| 12.204| 12.795| 13.446| 14.168| 14.971| 15.871| 16.885| 18.039| 19.361| 20.892| 22.687| 24.819| 27.394| 30.564| 34.564| 39.768| 46.818| 56.906| 72.535|100.000| ---
|
||||
2| 6.941| 7.248| 7.583| 7.950| 8.355| 8.803| 9.302| 9.861| 10.492| 11.208| 12.030| 12.982| 14.097| 15.422| 17.021| 18.991| 21.477| 24.710| 29.091| 35.359| 45.070| 62.136|100.000
|
||||
1| 2.711| 2.831| 2.962| 3.106| 3.264| 3.439| 3.634| 3.852| 4.098| 4.378| 4.699| 5.071| 5.507| 6.024| 6.649| 7.418| 8.389| 9.653| 11.364| 13.812| 17.606| 24.272| 39.063
|
||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
| 24| 23| 22| 21| 20| 19| 18| 17| 16| 15| 14| 13| 12| 11| 10| 9| 8| 7| 6| 5| 4| 3| 2
|
||||
|
||||
----------------------------------------------------------*/
|
||||
#header, #footer {
|
||||
width:100%;
|
||||
}
|
||||
#header {
|
||||
overflow:hidden;
|
||||
}
|
||||
#content {
|
||||
overflow:auto;
|
||||
padding:1.4em;
|
||||
}
|
||||
#main {
|
||||
display:inline;
|
||||
float:right;
|
||||
width:83.08%;
|
||||
}
|
||||
#navigation {
|
||||
display:inline;
|
||||
float:left;
|
||||
width:15.401%;
|
||||
}
|
||||
.wrapper, .sections {
|
||||
overflow:hidden;
|
||||
}
|
||||
.sections .primary {
|
||||
display:inline;
|
||||
float:left;
|
||||
width:74.543%;
|
||||
}
|
||||
.sections .secondary {
|
||||
display:inline;
|
||||
float:left;
|
||||
margin-left:1.71%;
|
||||
width:23.629%;
|
||||
}
|
||||
|
||||
|
||||
/* Headings and defaults
|
||||
----------------------------------------------------------*/
|
||||
h1, h2, h3, h4, h5, legend {
|
||||
padding:.4em 0;
|
||||
font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif;
|
||||
font-style: normal;
|
||||
font-weight:normal;
|
||||
}
|
||||
h1 { font-size:2.8em; } /* 28px */
|
||||
h2 { font-size:2.4em; } /* 24px */
|
||||
h3 { font-size:2.1em; } /* 21px */
|
||||
h3 span { font-size:.57em; } /* 12px */
|
||||
h4 { font-size:1.8em; } /* 18px */
|
||||
h5 { font-size:1.6em; } /* 16px */
|
||||
|
||||
h6, p, legend, label, input, select, .button,
|
||||
.message, .validation-summary-errors,
|
||||
table.items th, table.items td, table.items caption { font-size:1.5em; line-height:1.5em; } /* 15px */
|
||||
p .button { font-size:inherit; }
|
||||
.meta { font-size:1.2em; } /* 12px */
|
||||
|
||||
|
||||
|
||||
/* Links
|
||||
----------------------------------------------------------*/
|
||||
a, a:link, a:visited {
|
||||
color:#1e5d7d;
|
||||
text-decoration:none;
|
||||
}
|
||||
a:hover, a:active, a:focus {
|
||||
color:#1e5d7d;
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
|
||||
/* Header - Branding and Login
|
||||
----------------------------------------------------------*/
|
||||
#header {
|
||||
background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right;
|
||||
height:60px;
|
||||
}
|
||||
#header h1 {
|
||||
float:left;
|
||||
}
|
||||
#header h1 a {
|
||||
background:url(images/orchardLogo.jpg) no-repeat;
|
||||
display:block;
|
||||
height:60px;
|
||||
margin:-11px 0 0 14px;
|
||||
text-indent:-9999px;
|
||||
width:105px;
|
||||
}
|
||||
#site, #login {
|
||||
font-size:1.5em;
|
||||
}
|
||||
#site a, #site a:visited, #site a:active {
|
||||
color:#e2e4dd;
|
||||
float:left;
|
||||
line-height:2.2em;
|
||||
padding:14px 0 0 12px;
|
||||
position:relative;
|
||||
}
|
||||
#login {
|
||||
color:#1a1505;
|
||||
display:block;
|
||||
float:right;
|
||||
margin:20px 20px 0 0;
|
||||
white-space:nowrap;
|
||||
}
|
||||
#login a, #login a:link, #login a:visited {
|
||||
color:#e2e4dd;
|
||||
padding:0;
|
||||
}
|
||||
#login a:hover, #login a:active, #login a:focus {
|
||||
color:#ffea9b;
|
||||
}
|
||||
|
||||
|
||||
/* Navigation
|
||||
----------------------------------------------------------*/
|
||||
#navshortcut {
|
||||
height:0;
|
||||
overflow:hidden;
|
||||
width:0;
|
||||
}
|
||||
|
||||
#navigation li {
|
||||
background:#fff;
|
||||
border:1px solid #d2d6c6;
|
||||
margin:10px 0 15px 0;
|
||||
}
|
||||
#navigation ul li {
|
||||
border:0;
|
||||
margin:0;
|
||||
}
|
||||
#navigation li h4 {
|
||||
padding:0;
|
||||
}
|
||||
#navigation li h4 a, #navigation li h4 span {
|
||||
background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
|
||||
display:block;
|
||||
padding:6px 4px 8px 8px;
|
||||
}
|
||||
#navigation li h4 a, #navigation li h4 a:link, #navigation li h4 a:visited {
|
||||
color:inherit;
|
||||
}
|
||||
#navigation li h4 a:hover, #navigation li h4 a:active, #navigation li h4 a:focus {
|
||||
background:#8a8f7a;
|
||||
color:#f6faea;
|
||||
text-decoration:none;
|
||||
}
|
||||
#navigation ul a, #navigation ul a:link, #navigation ul a:visited {
|
||||
color:#5a5b32;
|
||||
display:block;
|
||||
font-size:1.5em;
|
||||
height:28px;
|
||||
line-height:28px;
|
||||
padding:0 0 0 12px;
|
||||
text-decoration:none;
|
||||
}
|
||||
#navigation ul a:hover, #navigation ul a:active, #navigation ul a:focus {
|
||||
background:#f0ecd2;
|
||||
color: #3e4301;
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
|
||||
/* Content
|
||||
----------------------------------------------------------*/
|
||||
#main h2 {
|
||||
margin:.23em 0 1em;
|
||||
}
|
||||
#main h3, #main h4 {
|
||||
margin:.5em 0;
|
||||
}
|
||||
#main p {
|
||||
margin:0 0 1.5em;
|
||||
}
|
||||
#main .main.actions {
|
||||
margin:0 0 1.4em;
|
||||
}
|
||||
#main .meta {
|
||||
margin:-.4em 0 .4em;
|
||||
}
|
||||
#main form {
|
||||
margin:.345em 0 1.5em;
|
||||
}
|
||||
#main h2 {
|
||||
border-bottom:1px dashed #e4e7dc;
|
||||
}
|
||||
#main h3 {
|
||||
border-bottom:1px solid #e4e7dc;
|
||||
}
|
||||
|
||||
|
||||
/* Confirmations, Messages and the like
|
||||
----------------------------------------------------------*/
|
||||
.message, .validation-summary-errors {
|
||||
margin:10px 0 4px 0;
|
||||
padding:4px;
|
||||
}
|
||||
span.message {
|
||||
display:block;
|
||||
margin:4px 0 4px 4px;
|
||||
}
|
||||
.message a {
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.confirmation.message {
|
||||
background:#e6f1c9; /* green */
|
||||
border:1px solid #cfe493;
|
||||
}
|
||||
.warning.message {
|
||||
background:#fdf5bc; /* yellow */
|
||||
border:1px solid #ffea9b;
|
||||
}
|
||||
/* todo: (heskew) what else (other inputs) needs this? */
|
||||
.critical.message, .validation-summary-errors,
|
||||
.input-validation-error.text-box, .input-validation-error.text {
|
||||
border:1px solid #990808;
|
||||
}
|
||||
.critical.message, .validation-summary-errors {
|
||||
background:#e68585; /* red */
|
||||
color:#fff;
|
||||
}
|
||||
.info.message {
|
||||
background:#fff; /* orange :P */
|
||||
border:1px dashed #D2D6C6;
|
||||
}
|
||||
.debug.message {
|
||||
background:#eee;
|
||||
border:1px dashed #D2D6C6;
|
||||
color:#7a7a7a;
|
||||
margin:20px 0 14px 0;
|
||||
}
|
||||
.debug.message:before {
|
||||
content:"DEBUG » ";
|
||||
}
|
||||
|
||||
|
||||
/* Forms
|
||||
----------------------------------------------------------*/
|
||||
fieldset.bulk.actions {
|
||||
display:inline;
|
||||
height:auto;
|
||||
margin:0 1.4em -.7em 0;
|
||||
padding-top:0;
|
||||
}
|
||||
|
||||
label {
|
||||
display: block;
|
||||
font-weight:700;
|
||||
}
|
||||
fieldset.bulk.actions label, label.sub {
|
||||
display:inline;
|
||||
}
|
||||
label span {
|
||||
font-weight:normal;
|
||||
}
|
||||
label input {
|
||||
vertical-align:text-top;
|
||||
}
|
||||
/* todo: (heskew) try to get .text on stuff like .text-box */
|
||||
select, textarea, input.text, input.text-box {
|
||||
padding:2px;
|
||||
border:1px solid #d2d6c6;
|
||||
color:#5a5b32;
|
||||
}
|
||||
input.text, input.text-box {
|
||||
line-height:1.2em;
|
||||
}
|
||||
select:focus, textarea:focus, input.text:focus, input.text-box:focus {
|
||||
border-color:#666d51;
|
||||
}
|
||||
.permalink input {
|
||||
background:transparent;
|
||||
border-color:#EAE9D9;
|
||||
border-style:dashed;
|
||||
margin-left:0;
|
||||
width:350px;
|
||||
}
|
||||
.permalink input:focus {
|
||||
background:#FFF;
|
||||
border-color:#666d51;
|
||||
border-style:solid;
|
||||
}
|
||||
input.large.text, textarea, fieldset {
|
||||
clear:both;
|
||||
}
|
||||
fieldset {
|
||||
margin:.7em 0 .4em;
|
||||
}
|
||||
textarea {
|
||||
min-height:8em;
|
||||
}
|
||||
.primary input.large.text, .primary textarea {
|
||||
margin:0;
|
||||
padding:4px;
|
||||
width:98%;
|
||||
}
|
||||
|
||||
/* todo: (heskew) move editor specific style elsewhere */
|
||||
.primary .mceEditor {
|
||||
display:block;
|
||||
margin:0;
|
||||
}
|
||||
.secondary fieldset {
|
||||
margin:.446% 0 .446% .446%;
|
||||
padding:4px;
|
||||
width:98.662%;
|
||||
}
|
||||
|
||||
button, .button, .button:link, .button:visited {
|
||||
background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
|
||||
border:1px solid #d2d6c6;
|
||||
color:#5a5b32;
|
||||
cursor:pointer;
|
||||
height:26px;
|
||||
padding:0 8px 3px;
|
||||
text-align:center;
|
||||
}
|
||||
button.remove, .remove.button, .remove.button:link, .remove.button:visited {
|
||||
background-color:#DECCCA;
|
||||
background-image:url(images/tableHeaderBackgroundRed.gif);
|
||||
border-color:#d6c9c7;
|
||||
color:#5c3732;
|
||||
}
|
||||
a.button, a.button:link, a.button:visited {
|
||||
line-height:1em;
|
||||
padding:.2em .6em;
|
||||
}
|
||||
button:hover, .button:hover,
|
||||
button:active, .button:active,
|
||||
button:focus, .button:focus {
|
||||
background:#8a8f7a;
|
||||
border-color:#666d51;
|
||||
color:#f6faea;
|
||||
text-decoration:none;
|
||||
}
|
||||
button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
|
||||
border-color:#8a8f7a;
|
||||
}
|
||||
button.remove:hover, .remove.button:hover,
|
||||
button.remove:active, .remove.button:active,
|
||||
button.remove:focus, .remove.button:focus {
|
||||
background:#8f7c79;
|
||||
border-color:#6e5551;
|
||||
color:#faedeb;
|
||||
}
|
||||
button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
|
||||
border-color:#8f7c79;
|
||||
}
|
||||
.delete.button {
|
||||
float:right;
|
||||
}
|
||||
.cancel {
|
||||
margin:0 0 0 .93em;
|
||||
}
|
||||
.manage {
|
||||
float:right;
|
||||
margin:4px 0 6px 4px;
|
||||
overflow:hidden;
|
||||
}
|
||||
.actions {
|
||||
height:2em;
|
||||
overflow:hidden;
|
||||
padding:.6em 0 .1em;
|
||||
text-align:right;
|
||||
}
|
||||
.actions .construct {
|
||||
float:left;
|
||||
}
|
||||
.actions .destruct {
|
||||
float:right;
|
||||
}
|
||||
.manage a.button {
|
||||
float:right;
|
||||
height:inherit;
|
||||
margin-left:.3em;
|
||||
padding-bottom:.3em;
|
||||
padding-top:.3em;
|
||||
}
|
||||
|
||||
|
||||
/* Icon buttons
|
||||
----------------------------------------------------------*/
|
||||
a.ibutton, a.ibutton:link, a.ibutton:visited {
|
||||
background:url(images/icons.png) 0 -20px;
|
||||
border:none;
|
||||
display:inline;
|
||||
float:left;
|
||||
height:17px;
|
||||
overflow:hidden;
|
||||
padding:0 0 0 17px;
|
||||
width:0;
|
||||
}
|
||||
a.ibutton:hover, a.ibutton:active, a.ibutton:focus { background-position:0 0; }
|
||||
a.ibutton.remove,
|
||||
a.ibutton.remove:link,
|
||||
a.ibutton.remove:visited { background-position:-20px -20px; }
|
||||
a.ibutton.remove:hover, a.ibutton.remove:active, a.ibutton.remove:focus { background-position:-20px 0; }
|
||||
a.ibutton.view,
|
||||
a.ibutton.view:link,
|
||||
a.ibutton.view:visited { background-position:-40px -20px; }
|
||||
a.ibutton.view:hover, a.ibutton.view:active, a.ibutton.view:focus { background-position:-40px 0; }
|
||||
a.ibutton.add.page,
|
||||
a.ibutton.add.page:link,
|
||||
a.ibutton.add.page:visited { background-position:-60px -20px; }
|
||||
a.ibutton.add.page:hover, a.ibutton.add.page:active, a.ibutton.add.page:focus { background-position:-60px 0; }
|
||||
a.ibutton.edit,
|
||||
a.ibutton.edit:link,
|
||||
a.ibutton.edit:visited { background-position:-80px -20px; }
|
||||
a.ibutton.edit:hover, a.ibutton.edit:active, a.ibutton.edit:focus { background-position:-80px 0; }
|
||||
a.ibutton.publish,
|
||||
a.ibutton.publish:link,
|
||||
a.ibutton.publish:visited { background-position:-100px -20px; }
|
||||
a.ibutton.publish:hover, a.ibutton.publish:active, a.ibutton.publish:focus { background-position:-100px 0; }
|
||||
a.ibutton.blog,
|
||||
a.ibutton.blog:link,
|
||||
a.ibutton.blog:visited { background-position:-120px -20px; }
|
||||
a.ibutton.blog:hover, a.ibutton.blog:active, a.ibutton.blog:focus { background-position:-120px 0; }
|
||||
|
||||
|
||||
/* todo: (heskew) needs attention */
|
||||
.withActions {
|
||||
overflow:hidden;
|
||||
}
|
||||
.withActions a {
|
||||
display:inline;
|
||||
float:left;
|
||||
margin-right:7px;
|
||||
}
|
||||
|
||||
|
||||
/* Content item lists
|
||||
----------------------------------------------------------*/
|
||||
.contentItems {
|
||||
background:#FFF;
|
||||
border:1px solid #B0B083;
|
||||
margin:1.4em 0;
|
||||
padding:2px;
|
||||
}
|
||||
.contentItems li {
|
||||
background:#FFF;
|
||||
border-bottom:1px solid #EAE9D9;
|
||||
margin:0;
|
||||
overflow:hidden;
|
||||
padding:.7em 1.4em;
|
||||
}
|
||||
.contentItems li.last {
|
||||
border-bottom:0;
|
||||
}
|
||||
#main .contentItems li h3 {
|
||||
border-bottom:0;
|
||||
margin-top:0;
|
||||
}
|
||||
#main .contentItems li .actions {
|
||||
color:#EAE9D9;
|
||||
height:auto;
|
||||
margin:-1.3em 0 0;
|
||||
padding:0 0 .1em;
|
||||
}
|
||||
#main .contentItems li .actions .ibutton {
|
||||
margin-right:6px;
|
||||
}
|
||||
#main .contentItems li .actions .destruct .ibutton {
|
||||
margin-left:8px;
|
||||
margin-right:0;
|
||||
}
|
||||
#main .contentItems li:hover { background:#fafbed; }
|
||||
#main .contentItems li:hover a.ibutton { background-position:0 0; }
|
||||
#main .contentItems li:hover a.ibutton.remove { background-position:-20px 0; }
|
||||
#main .contentItems li:hover a.ibutton.view { background-position:-40px 0; }
|
||||
#main .contentItems li:hover a.ibutton.add.page { background-position:-60px 0; }
|
||||
#main .contentItems li:hover a.ibutton.edit { background-position:-80px 0; }
|
||||
#main .contentItems li:hover a.ibutton.publish { background-position:-100px 0; }
|
||||
#main .contentItems li:hover a.ibutton.blog { background-position:-120px 0; }
|
||||
|
||||
|
||||
/* (Items) Tables
|
||||
----------------------------------------------------------*/
|
||||
table.items {
|
||||
background:#fff;
|
||||
border:1px solid #B0B083;
|
||||
border-collapse:separate;
|
||||
border-spacing:0;
|
||||
width:100%;
|
||||
}
|
||||
table.items caption {
|
||||
padding:8px 0;
|
||||
text-indent:0;
|
||||
}
|
||||
table.items col {
|
||||
border-spacing:0;
|
||||
display:table-column;
|
||||
}
|
||||
table.items colgroup
|
||||
{
|
||||
border-spacing:0;
|
||||
display:table-column-group;
|
||||
}
|
||||
table.items tbody {
|
||||
border-spacing:0;
|
||||
vertical-align:middle;
|
||||
}
|
||||
table.items thead, table.items th {
|
||||
background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
|
||||
font-weight:700;
|
||||
overflow:hidden;
|
||||
text-align:left;
|
||||
}
|
||||
/* todo: (heskew) hook back up */
|
||||
table.items tr.hover {
|
||||
background-color:#f0f3d6;
|
||||
}
|
||||
table.items tr.critical {background:#e68585; border:inherit;}
|
||||
table.items tr.warning {background:#fdf5bc; border:inherit;}
|
||||
table.items th, table.items td {
|
||||
border-bottom:1px solid #EAE9D9;
|
||||
border-spacing:0px;
|
||||
display:table-cell;
|
||||
padding:8px 12px;
|
||||
vertical-align:middle;
|
||||
}
|
||||
|
||||
|
||||
/* MISC.
|
||||
todo: (heskew) pull out into relevant modules where appropriate
|
||||
----------------------------------------------------------*/
|
||||
|
||||
/* CMSPages
|
||||
----------------------------------------------------------*/
|
||||
.templates fieldset {
|
||||
margin:0 0 .933%;
|
||||
}
|
||||
.templates p {
|
||||
overflow:hidden;
|
||||
}
|
||||
.templates p img {
|
||||
float:left;
|
||||
height:144px;
|
||||
margin:.27em .93em .93em .54em;
|
||||
width:124px;
|
||||
}
|
||||
.previewImage {
|
||||
border:1px solid #525e50;
|
||||
height:70%;
|
||||
width:70%;
|
||||
}
|
||||
|
||||
/* Rounded borders and other "works in some browsers" additions
|
||||
----------------------------------------------------------*/
|
||||
#content, #navigation li, button, .button,
|
||||
table.items, textarea, input.text, input.text-box,
|
||||
.contentItems, .message, .validation-summary-errors {
|
||||
-moz-border-radius:4px;
|
||||
-webkit-border-radius:4px;
|
||||
border-radius:4px;
|
||||
}
|
||||
#navigation li h4 a {
|
||||
-moz-border-radius:3px 3px 0 0;
|
||||
-webkit-border-radius:3px 3px 0 0;
|
||||
border-radius:3px 3px 0 0;
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 500 B |
Binary file not shown.
|
Before Width: | Height: | Size: 501 B |
@@ -1,449 +0,0 @@
|
||||
/*----------------------------------------------------------
|
||||
The base color for this template is #5c87b2. If you'd like
|
||||
to use a different color start by replacing all instances of
|
||||
#5c87b2 with your new color.
|
||||
----------------------------------------------------------*/
|
||||
body
|
||||
{
|
||||
background-color: #5c87b2;
|
||||
font-size: .75em;
|
||||
font-family: Verdana, Helvetica, Sans-Serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
color: #696969;
|
||||
}
|
||||
|
||||
a:link
|
||||
{
|
||||
color: #034af3;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a:visited
|
||||
{
|
||||
color: #505abc;
|
||||
}
|
||||
a:hover
|
||||
{
|
||||
color: #1d60ff;
|
||||
text-decoration: none;
|
||||
}
|
||||
a:active
|
||||
{
|
||||
color: #12eb87;
|
||||
}
|
||||
|
||||
p, ul
|
||||
{
|
||||
margin-bottom: 20px;
|
||||
line-height: 1.6em;
|
||||
}
|
||||
|
||||
/* HEADINGS
|
||||
----------------------------------------------------------*/
|
||||
h1, h2, h3, h4, h5, h6
|
||||
{
|
||||
font-size: 1.5em;
|
||||
color: #000;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
}
|
||||
|
||||
h1
|
||||
{
|
||||
font-size: 2em;
|
||||
padding-bottom: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
h2
|
||||
{
|
||||
padding: 0 0 10px 0;
|
||||
}
|
||||
h3
|
||||
{
|
||||
font-size: 1.2em;
|
||||
}
|
||||
h4
|
||||
{
|
||||
font-size: 1.1em;
|
||||
}
|
||||
h5, h6
|
||||
{
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
/* this rule styles <h2> tags that are the
|
||||
first child of the left and right table columns */
|
||||
.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2
|
||||
{
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* PRIMARY LAYOUT ELEMENTS
|
||||
----------------------------------------------------------*/
|
||||
|
||||
/* you can specify a greater or lesser percentage for the
|
||||
page width. Or, you can specify an exact pixel width. */
|
||||
.page
|
||||
{
|
||||
width: 90%;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
#header
|
||||
{
|
||||
position: relative;
|
||||
margin-bottom: 0px;
|
||||
color: #000;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#header h1
|
||||
{
|
||||
font-weight: bold;
|
||||
padding: 5px 0;
|
||||
margin: 0;
|
||||
color: #fff;
|
||||
border: none;
|
||||
line-height: 2em;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 32px !important;
|
||||
}
|
||||
|
||||
#main
|
||||
{
|
||||
padding: 30px 30px 15px 30px;
|
||||
background-color: #fff;
|
||||
margin-bottom: 30px;
|
||||
_height: 1px; /* only IE6 applies CSS properties starting with an underscrore */
|
||||
}
|
||||
|
||||
#footer
|
||||
{
|
||||
color: #999;
|
||||
padding: 10px 0;
|
||||
text-align: center;
|
||||
line-height: normal;
|
||||
margin: 0;
|
||||
font-size: .9em;
|
||||
}
|
||||
|
||||
/* TAB MENU
|
||||
----------------------------------------------------------*/
|
||||
ul#menu
|
||||
{
|
||||
border-bottom: 1px #5C87B2 solid;
|
||||
padding: 0 0 2px;
|
||||
position: relative;
|
||||
margin: 0;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
ul#menu li
|
||||
{
|
||||
display: inline;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
ul#menu li#greeting
|
||||
{
|
||||
padding: 10px 20px;
|
||||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
line-height: 2.8em;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
ul#menu li a
|
||||
{
|
||||
padding: 10px 20px;
|
||||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
line-height: 2.8em;
|
||||
background-color: #e8eef4;
|
||||
color: #034af3;
|
||||
}
|
||||
|
||||
ul#menu li a:hover
|
||||
{
|
||||
background-color: #fff;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
ul#menu li a:active
|
||||
{
|
||||
background-color: #a6e2a6;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
ul#menu li.selected a
|
||||
{
|
||||
background-color: #fff;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
/* FORM LAYOUT ELEMENTS
|
||||
----------------------------------------------------------*/
|
||||
|
||||
fieldset
|
||||
{
|
||||
margin: 1em 0;
|
||||
padding: 1em;
|
||||
border: 1px solid #CCC;
|
||||
}
|
||||
|
||||
fieldset p
|
||||
{
|
||||
margin: 2px 12px 10px 10px;
|
||||
}
|
||||
|
||||
fieldset label
|
||||
{
|
||||
display: block;
|
||||
}
|
||||
|
||||
fieldset label.inline
|
||||
{
|
||||
display: inline;
|
||||
}
|
||||
|
||||
legend
|
||||
{
|
||||
font-size: 1.1em;
|
||||
font-weight: 600;
|
||||
padding: 2px 4px 8px 4px;
|
||||
}
|
||||
|
||||
input[type="text"]
|
||||
{
|
||||
width: 200px;
|
||||
border: 1px solid #CCC;
|
||||
}
|
||||
|
||||
input[type="password"]
|
||||
{
|
||||
width: 200px;
|
||||
border: 1px solid #CCC;
|
||||
}
|
||||
|
||||
/* TABLE
|
||||
----------------------------------------------------------*/
|
||||
|
||||
table
|
||||
{
|
||||
border: solid 1px #e8eef4;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
table td
|
||||
{
|
||||
padding: 5px;
|
||||
border: solid 1px #e8eef4;
|
||||
}
|
||||
|
||||
table th
|
||||
{
|
||||
padding: 6px 5px;
|
||||
text-align: left;
|
||||
background-color: #e8eef4;
|
||||
border: solid 1px #e8eef4;
|
||||
}
|
||||
|
||||
/* MISC
|
||||
----------------------------------------------------------*/
|
||||
.clear
|
||||
{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.error
|
||||
{
|
||||
color:Red;
|
||||
}
|
||||
|
||||
#menucontainer
|
||||
{
|
||||
margin-top:40px;
|
||||
}
|
||||
|
||||
div#title
|
||||
{
|
||||
display:block;
|
||||
float:left;
|
||||
text-align:left;
|
||||
}
|
||||
|
||||
#logindisplay
|
||||
{
|
||||
font-size:1.1em;
|
||||
display:block;
|
||||
text-align:right;
|
||||
margin:10px;
|
||||
color:White;
|
||||
}
|
||||
|
||||
#logindisplay a:link
|
||||
{
|
||||
color: white;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
#logindisplay a:visited
|
||||
{
|
||||
color: white;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
#logindisplay a:hover
|
||||
{
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.field-validation-error
|
||||
{
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
.input-validation-error
|
||||
{
|
||||
border: 1px solid #ff0000;
|
||||
background-color: #ffeeee;
|
||||
}
|
||||
|
||||
.validation-summary-errors
|
||||
{
|
||||
font-weight: bold;
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
|
||||
/* ALL THAT IS BELOW IS TEMPORARY TO MAKE THINGS LOOK DECENT IN THIS SKIN */
|
||||
.manage {
|
||||
float:right;
|
||||
}
|
||||
.metadata {
|
||||
color:#999;
|
||||
margin-top:-2em;
|
||||
}
|
||||
.blog.metadata {
|
||||
margin-top:-1.5em;
|
||||
}
|
||||
.metadata, p.tags {
|
||||
font-size:95%;
|
||||
}
|
||||
|
||||
/* Icon buttons
|
||||
----------------------------------------------------------*/
|
||||
a.ibutton, a.ibutton:link, a.ibutton:visited {
|
||||
background:url(Admin/css/images/icons.png) 0 -20px;
|
||||
border:none;
|
||||
display:inline;
|
||||
float:left;
|
||||
height:17px;
|
||||
overflow:hidden;
|
||||
padding:0 0 0 17px;
|
||||
width:0;
|
||||
}
|
||||
a.ibutton:hover, a.ibutton:active, a.ibutton:focus { background-position:0 0; }
|
||||
a.ibutton.remove,
|
||||
a.ibutton.remove:link,
|
||||
a.ibutton.remove:visited { background-position:-20px -20px; }
|
||||
a.ibutton.remove:hover, a.ibutton.remove:active, a.ibutton.remove:focus { background-position:-20px 0; }
|
||||
a.ibutton.view,
|
||||
a.ibutton.view:link,
|
||||
a.ibutton.view:visited { background-position:-40px -20px; }
|
||||
a.ibutton.view:hover, a.ibutton.view:active, a.ibutton.view:focus { background-position:-40px 0; }
|
||||
a.ibutton.add.page,
|
||||
a.ibutton.add.page:link,
|
||||
a.ibutton.add.page:visited { background-position:-60px -20px; }
|
||||
a.ibutton.add.page:hover, a.ibutton.add.page:active, a.ibutton.add.page:focus { background-position:-60px 0; }
|
||||
a.ibutton.edit,
|
||||
a.ibutton.edit:link,
|
||||
a.ibutton.edit:visited { background-position:-80px -20px; }
|
||||
a.ibutton.edit:hover, a.ibutton.edit:active, a.ibutton.edit:focus { background-position:-80px 0; }
|
||||
a.ibutton.publish,
|
||||
a.ibutton.publish:link,
|
||||
a.ibutton.publish:visited { background-position:-100px -20px; }
|
||||
a.ibutton.publish:hover, a.ibutton.publish:active, a.ibutton.publish:focus { background-position:-100px 0; }
|
||||
a.ibutton.blog,
|
||||
a.ibutton.blog:link,
|
||||
a.ibutton.blog:visited { background-position:-120px -20px; }
|
||||
a.ibutton.blog:hover, a.ibutton.blog:active, a.ibutton.blog:focus { background-position:-120px 0; }
|
||||
|
||||
/* Forms
|
||||
----------------------------------------------------------*/
|
||||
fieldset {
|
||||
border:0;
|
||||
margin:0 0 1em;
|
||||
padding:0;
|
||||
}
|
||||
form.comments {
|
||||
overflow:hidden;
|
||||
}
|
||||
form.comments fieldset.who, form.comments fieldset.what {
|
||||
float:left;
|
||||
margin-right:15px;
|
||||
}
|
||||
form.comments label {
|
||||
font-weight:bold;
|
||||
margin-top:15px;
|
||||
}
|
||||
form.comments .button {
|
||||
margin-top:15px;
|
||||
|
||||
}
|
||||
|
||||
/* Tag cloud
|
||||
----------------------------------------------------------*/
|
||||
ul.tagCloud {
|
||||
padding:0;
|
||||
}
|
||||
ul.tagCloud li {
|
||||
display:inline;
|
||||
list-style-type:none;
|
||||
padding:5px 15px 5px 0;
|
||||
}
|
||||
|
||||
/* Content item lists
|
||||
----------------------------------------------------------*/
|
||||
.contentItems {
|
||||
background:#FFF;
|
||||
margin:1.4em 0;
|
||||
padding:2px;
|
||||
}
|
||||
.contentItems li {
|
||||
background:#FFF;
|
||||
border-bottom:1px solid #E0E8EF;
|
||||
margin:0;
|
||||
overflow:hidden;
|
||||
padding:.7em 0;
|
||||
}
|
||||
.contentItems li.last {
|
||||
border-bottom:0;
|
||||
}
|
||||
.contentItems li h3 {
|
||||
border-bottom:0;
|
||||
}
|
||||
.contentItems li.first h3 {
|
||||
margin-top:0;
|
||||
}
|
||||
.contentItems li .actions {
|
||||
color:#EAE9D9;
|
||||
height:auto;
|
||||
margin:-1.3em 0 0;
|
||||
padding:0 0 .1em;
|
||||
}
|
||||
.contentItems li .actions .ibutton {
|
||||
margin-right:6px;
|
||||
}
|
||||
.contentItems li .actions .destruct .ibutton {
|
||||
margin-left:8px;
|
||||
margin-right:0;
|
||||
}
|
||||
.contentItems li:hover a.ibutton { background-position:0 0; }
|
||||
.contentItems li:hover a.ibutton.remove { background-position:-20px 0; }
|
||||
.contentItems li:hover a.ibutton.view { background-position:-40px 0; }
|
||||
.contentItems li:hover a.ibutton.add.page { background-position:-60px 0; }
|
||||
.contentItems li:hover a.ibutton.edit { background-position:-80px 0; }
|
||||
.contentItems li:hover a.ibutton.publish { background-position:-100px 0; }
|
||||
.contentItems li:hover a.ibutton.blog { background-position:-120px 0; }
|
||||
@@ -145,6 +145,8 @@
|
||||
<Content Include="Themes\Views\Admin\Install.aspx" />
|
||||
<Content Include="Themes\Views\Shared\document.aspx" />
|
||||
<Content Include="Themes\Views\Shared\layout.ascx" />
|
||||
<Content Include="Themes\Views\Shared\user.ascx" />
|
||||
<Content Include="Themes\Views\Shared\menu.ascx" />
|
||||
<Content Include="Themes\Views\Web.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<title><%=Html.Title("!!Safe Mode!!")%></title><%
|
||||
<title><%=Html.Title() %></title><%
|
||||
Html.Zone("head", ":metas :styles :scripts"); %>
|
||||
</head>
|
||||
<body><%
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html" %><%
|
||||
Html.RegisterStyle("site.css");
|
||||
Html.RegisterStyle("site.css"); %>
|
||||
<div class="page">
|
||||
<div id="header"><%
|
||||
<div id="header">
|
||||
<div id="title"><h1>My MVC Application</h1></div><%
|
||||
Html.Zone("header");
|
||||
Html.Zone("menu");
|
||||
%></div>
|
||||
Html.Zone("menu"); %>
|
||||
<%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
|
||||
<% Html.Include("user"); %>
|
||||
<%-- todo:(nheskew) this will need to be a generated menu --%>
|
||||
<% Html.Include("menu"); %>
|
||||
</div>
|
||||
<div id="main"><%
|
||||
Html.ZoneBody("content");
|
||||
%> <div id="footer"><%
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
|
||||
<div id="menucontainer">
|
||||
<ul id="menu">
|
||||
<li><%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%></li>
|
||||
8
src/Orchard.Web/Core/Themes/Views/Shared/user.ascx
Normal file
8
src/Orchard.Web/Core/Themes/Views/Shared/user.ascx
Normal file
@@ -0,0 +1,8 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<div id="logindisplay"><%
|
||||
if (Request.IsAuthenticated) {
|
||||
%>Welcome <strong><%=Html.Encode(Page.User.Identity.Name) %></strong>! [<%=Html.ActionLink("Log Off", "LogOff", "Account", new { area = "" }, new { }) %>]<%
|
||||
} else {
|
||||
%>[<%=Html.ActionLink("Log On", "LogOn", "Account", new{area=""}, new{}) %>]<%
|
||||
}
|
||||
%></div>
|
||||
@@ -92,19 +92,17 @@
|
||||
<Content Include="Default.aspx" />
|
||||
<Content Include="Global.asax" />
|
||||
<Content Include="Web.config" />
|
||||
<Content Include="Content\Site.css" />
|
||||
<Content Include="Scripts\jquery-1.3.2.js" />
|
||||
<Content Include="Scripts\jquery-1.3.2.min.js" />
|
||||
<Content Include="Scripts\jquery-1.3.2-vsdoc.js" />
|
||||
<Content Include="Scripts\jquery-1.3.2.min-vsdoc.js" />
|
||||
<Content Include="Views\Account\ChangePassword.aspx" />
|
||||
<Content Include="Views\Account\ChangePasswordSuccess.aspx" />
|
||||
<Content Include="Views\Account\LogOn.aspx" />
|
||||
<Content Include="Views\Account\Register.aspx" />
|
||||
<Content Include="Views\Home\About.aspx" />
|
||||
<Content Include="Views\Home\Index.aspx" />
|
||||
<Content Include="Views\Account\ChangePassword.ascx" />
|
||||
<Content Include="Views\Account\ChangePasswordSuccess.ascx" />
|
||||
<Content Include="Views\Account\LogOn.ascx" />
|
||||
<Content Include="Views\Account\Register.ascx" />
|
||||
<Content Include="Views\Home\About.ascx" />
|
||||
<Content Include="Views\Home\Index.ascx" />
|
||||
<Content Include="Views\Shared\Error.aspx" />
|
||||
<Content Include="Views\Shared\LogOnUserControl.ascx" />
|
||||
<Content Include="Views\Shared\Site.Master" />
|
||||
<Content Include="Views\Web.config" />
|
||||
</ItemGroup>
|
||||
@@ -158,16 +156,8 @@
|
||||
<Name>TinyMce</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Content\Admin\css\images\background_header.jpg" />
|
||||
<Content Include="Content\Admin\css\images\orchardLogo.jpg" />
|
||||
<Content Include="Content\Admin\css\images\tableHeaderBackground.gif" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Config\Diagnostics.config" />
|
||||
<Content Include="Content\Admin\css\base.css" />
|
||||
<Content Include="Content\Admin\css\images\icons.png" />
|
||||
<Content Include="Content\Admin\css\images\tableHeaderBackgroundRed.gif" />
|
||||
<Content Include="Content\Images\headerBackground.gif" />
|
||||
<Content Include="Content\Images\header_background.gif" />
|
||||
<Content Include="Content\Images\innerheader_background.gif" />
|
||||
@@ -176,10 +166,6 @@
|
||||
<Content Include="Content\Site2.css" />
|
||||
<Content Include="Content\Site3.css" />
|
||||
<Content Include="Views\Shared\Messages.ascx" />
|
||||
<Content Include="Views\Shared\ExtraUserControl.ascx" />
|
||||
<Content Include="Views\Shared\Footer.ascx" />
|
||||
<Content Include="Views\Shared\Header.ascx" />
|
||||
<Content Include="Views\Shared\Navigation.ascx" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="App_Data\" />
|
||||
|
||||
33
src/Orchard.Web/Views/Account/ChangePassword.ascx
Normal file
33
src/Orchard.Web/Views/Account/ChangePassword.ascx
Normal file
@@ -0,0 +1,33 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html"%>
|
||||
<% Html.Title("Change Password"); %>
|
||||
<h2>Change Password</h2>
|
||||
<p>Use the form below to change your password. </p>
|
||||
<p>New passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.</p>
|
||||
<%= Html.ValidationSummary("Password change was unsuccessful. Please correct the errors and try again.")%>
|
||||
|
||||
<% using (Html.BeginForm()) { %>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend>Account Information</legend>
|
||||
<p>
|
||||
<label for="currentPassword">Current password:</label>
|
||||
<%= Html.Password("currentPassword") %>
|
||||
<%= Html.ValidationMessage("currentPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="newPassword">New password:</label>
|
||||
<%= Html.Password("newPassword") %>
|
||||
<%= Html.ValidationMessage("newPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="confirmPassword">Confirm new password:</label>
|
||||
<%= Html.Password("confirmPassword") %>
|
||||
<%= Html.ValidationMessage("confirmPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Change Password" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<% } %>
|
||||
@@ -1,42 +0,0 @@
|
||||
<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="changePasswordTitle" ContentPlaceHolderID="TitleContent" runat="server">
|
||||
Change Password
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="changePasswordContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<h2>Change Password</h2>
|
||||
<p>
|
||||
Use the form below to change your password.
|
||||
</p>
|
||||
<p>
|
||||
New passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.
|
||||
</p>
|
||||
<%= Html.ValidationSummary("Password change was unsuccessful. Please correct the errors and try again.")%>
|
||||
|
||||
<% using (Html.BeginForm()) { %>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend>Account Information</legend>
|
||||
<p>
|
||||
<label for="currentPassword">Current password:</label>
|
||||
<%= Html.Password("currentPassword") %>
|
||||
<%= Html.ValidationMessage("currentPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="newPassword">New password:</label>
|
||||
<%= Html.Password("newPassword") %>
|
||||
<%= Html.ValidationMessage("newPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="confirmPassword">Confirm new password:</label>
|
||||
<%= Html.Password("confirmPassword") %>
|
||||
<%= Html.ValidationMessage("confirmPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Change Password" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
5
src/Orchard.Web/Views/Account/ChangePasswordSuccess.ascx
Normal file
5
src/Orchard.Web/Views/Account/ChangePasswordSuccess.ascx
Normal file
@@ -0,0 +1,5 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html"%>
|
||||
<% Html.Title("Change Password"); %>
|
||||
<h2>Change Password</h2>
|
||||
<p>Your password has been changed successfully.</p>
|
||||
@@ -1,12 +0,0 @@
|
||||
<%@Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="changePasswordTitle" ContentPlaceHolderID="TitleContent" runat="server">
|
||||
Change Password
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="changePasswordSuccessContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<h2>Change Password</h2>
|
||||
<p>
|
||||
Your password has been changed successfully.
|
||||
</p>
|
||||
</asp:Content>
|
||||
34
src/Orchard.Web/Views/Account/LogOn.ascx
Normal file
34
src/Orchard.Web/Views/Account/LogOn.ascx
Normal file
@@ -0,0 +1,34 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html"%>
|
||||
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
|
||||
<% Html.Title("Log On"); %>
|
||||
<h2>Log On</h2>
|
||||
<p>
|
||||
Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.
|
||||
</p>
|
||||
<% if (Model != null && Model.Messages != null) Html.RenderPartial("Messages", Model.Messages); %>
|
||||
<%= Html.ValidationSummary("Login was unsuccessful. Please correct the errors and try again.") %>
|
||||
|
||||
<% using (Html.BeginForm()) { %>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend>Account Information</legend>
|
||||
<p>
|
||||
<label for="username">Username:</label>
|
||||
<%= Html.TextBox("username") %>
|
||||
<%= Html.ValidationMessage("username") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="password">Password:</label>
|
||||
<%= Html.Password("password") %>
|
||||
<%= Html.ValidationMessage("password") %>
|
||||
</p>
|
||||
<p>
|
||||
<%= Html.CheckBox("rememberMe") %> <label class="inline" for="rememberMe">Remember me?</label>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Log On" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<% } %>
|
||||
@@ -1,41 +0,0 @@
|
||||
<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<BaseViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
|
||||
|
||||
<asp:Content ID="loginTitle" ContentPlaceHolderID="TitleContent" runat="server">
|
||||
Log On
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="loginContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
|
||||
|
||||
<h2>Log On</h2>
|
||||
<p>
|
||||
Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.
|
||||
</p>
|
||||
<% if (Model != null && Model.Messages != null) Html.RenderPartial("Messages", Model.Messages); %>
|
||||
<%= Html.ValidationSummary("Login was unsuccessful. Please correct the errors and try again.") %>
|
||||
|
||||
<% using (Html.BeginForm()) { %>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend>Account Information</legend>
|
||||
<p>
|
||||
<label for="username">Username:</label>
|
||||
<%= Html.TextBox("username") %>
|
||||
<%= Html.ValidationMessage("username") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="password">Password:</label>
|
||||
<%= Html.Password("password") %>
|
||||
<%= Html.ValidationMessage("password") %>
|
||||
</p>
|
||||
<p>
|
||||
<%= Html.CheckBox("rememberMe") %> <label class="inline" for="rememberMe">Remember me?</label>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Log On" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
42
src/Orchard.Web/Views/Account/Register.ascx
Normal file
42
src/Orchard.Web/Views/Account/Register.ascx
Normal file
@@ -0,0 +1,42 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html"%>
|
||||
<% Html.Title("Register"); %>
|
||||
<h2>Create a New Account</h2>
|
||||
<p>
|
||||
Use the form below to create a new account.
|
||||
</p>
|
||||
<p>
|
||||
Passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.
|
||||
</p>
|
||||
<%= Html.ValidationSummary("Account creation was unsuccessful. Please correct the errors and try again.") %>
|
||||
|
||||
<% using (Html.BeginForm()) { %>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend>Account Information</legend>
|
||||
<p>
|
||||
<label for="username">Username:</label>
|
||||
<%= Html.TextBox("username") %>
|
||||
<%= Html.ValidationMessage("username") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="email">Email:</label>
|
||||
<%= Html.TextBox("email") %>
|
||||
<%= Html.ValidationMessage("email") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="password">Password:</label>
|
||||
<%= Html.Password("password") %>
|
||||
<%= Html.ValidationMessage("password") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="confirmPassword">Confirm password:</label>
|
||||
<%= Html.Password("confirmPassword") %>
|
||||
<%= Html.ValidationMessage("confirmPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Register" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<% } %>
|
||||
@@ -1,47 +0,0 @@
|
||||
<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="registerTitle" ContentPlaceHolderID="TitleContent" runat="server">
|
||||
Register
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="registerContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<h2>Create a New Account</h2>
|
||||
<p>
|
||||
Use the form below to create a new account.
|
||||
</p>
|
||||
<p>
|
||||
Passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.
|
||||
</p>
|
||||
<%= Html.ValidationSummary("Account creation was unsuccessful. Please correct the errors and try again.") %>
|
||||
|
||||
<% using (Html.BeginForm()) { %>
|
||||
<div>
|
||||
<fieldset>
|
||||
<legend>Account Information</legend>
|
||||
<p>
|
||||
<label for="username">Username:</label>
|
||||
<%= Html.TextBox("username") %>
|
||||
<%= Html.ValidationMessage("username") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="email">Email:</label>
|
||||
<%= Html.TextBox("email") %>
|
||||
<%= Html.ValidationMessage("email") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="password">Password:</label>
|
||||
<%= Html.Password("password") %>
|
||||
<%= Html.ValidationMessage("password") %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="confirmPassword">Confirm password:</label>
|
||||
<%= Html.Password("confirmPassword") %>
|
||||
<%= Html.ValidationMessage("confirmPassword") %>
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" value="Register" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
5
src/Orchard.Web/Views/Home/About.ascx
Normal file
5
src/Orchard.Web/Views/Home/About.ascx
Normal file
@@ -0,0 +1,5 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html"%>
|
||||
<% Html.Title("About Us"); %>
|
||||
<h2> About</h2>
|
||||
<p>Put content here.</p>
|
||||
@@ -1,12 +0,0 @@
|
||||
<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="aboutTitle" ContentPlaceHolderID="TitleContent" runat="server">
|
||||
About Us
|
||||
</asp:Content>
|
||||
<asp:Content ID="aboutContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<h2>
|
||||
About</h2>
|
||||
<p>
|
||||
Put content here.
|
||||
</p>
|
||||
</asp:Content>
|
||||
5
src/Orchard.Web/Views/Home/Index.ascx
Normal file
5
src/Orchard.Web/Views/Home/Index.ascx
Normal file
@@ -0,0 +1,5 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.Html"%>
|
||||
<% Html.Title("Home Page"); %>
|
||||
<h2><%= Html.Encode(ViewData["Message"]) %></h2>
|
||||
<p>To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.</p>
|
||||
@@ -1,12 +0,0 @@
|
||||
<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="indexTitle" ContentPlaceHolderID="TitleContent" runat="server">
|
||||
Home Page
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="indexContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<h2><%= Html.Encode(ViewData["Message"]) %></h2>
|
||||
<p>
|
||||
To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.
|
||||
</p>
|
||||
</asp:Content>
|
||||
@@ -1,2 +0,0 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<div id="title">
|
||||
<h1>
|
||||
My MVC Application</h1>
|
||||
</div>
|
||||
<div id="logindisplay">
|
||||
<% Html.RenderPartial("LogOnUserControl"); %>
|
||||
<% Html.RenderPartial("ExtraUserControl"); %>
|
||||
</div>
|
||||
@@ -1,18 +0,0 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
<%
|
||||
if (Request.IsAuthenticated) {
|
||||
%>
|
||||
Welcome <b>
|
||||
<%=Html.Encode(Page.User.Identity.Name)%></b>! [
|
||||
<%=Html.ActionLink("Log Off", "LogOff", "Account", new { area = "" }, new { })%>
|
||||
]
|
||||
<%
|
||||
}
|
||||
else {
|
||||
%>
|
||||
[
|
||||
<%=Html.ActionLink("Log On", "LogOn", "Account", new{area=""}, new{})%>
|
||||
]
|
||||
<%
|
||||
}
|
||||
%>
|
||||
@@ -1,4 +1,6 @@
|
||||
<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %>
|
||||
<h1>DON'T USE THE MASTER PAGE!</h1>
|
||||
<!-- note: this is bad, real bad, on purpose -->
|
||||
<h1><blink><font color=red>DON'T USE THE MASTER PAGE!</font></blink></h1>
|
||||
<h3>See the home and account "pages" in Orchard.Web for examples of the new hotness.</h3>
|
||||
<asp:ContentPlaceHolder ID="TitleContent" runat="server" />
|
||||
<asp:ContentPlaceHolder ID="MainContent" runat="server" />
|
||||
@@ -57,7 +57,7 @@ namespace Orchard.Controllers {
|
||||
public ActionResult Register() {
|
||||
ViewData["PasswordLength"] = MinPasswordLength;
|
||||
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
|
||||
[AcceptVerbs(HttpVerbs.Post)]
|
||||
@@ -79,14 +79,14 @@ namespace Orchard.Controllers {
|
||||
}
|
||||
|
||||
// If we got this far, something failed, redisplay form
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public ActionResult ChangePassword() {
|
||||
ViewData["PasswordLength"] = MinPasswordLength;
|
||||
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
@@ -110,17 +110,17 @@ namespace Orchard.Controllers {
|
||||
else {
|
||||
ModelState.AddModelError("_FORM",
|
||||
"The current password is incorrect or the new password is invalid.");
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
}
|
||||
catch {
|
||||
ModelState.AddModelError("_FORM", "The current password is incorrect or the new password is invalid.");
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
}
|
||||
|
||||
public ActionResult ChangePasswordSuccess() {
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
|
||||
protected override void OnActionExecuting(ActionExecutingContext filterContext) {
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Orchard.Controllers {
|
||||
|
||||
public ActionResult About() {
|
||||
|
||||
return View();
|
||||
return View(new BaseViewModel());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -84,7 +84,7 @@ namespace Orchard.Environment {
|
||||
|
||||
|
||||
private static string ModelsLocationFormat(ExtensionDescriptor descriptor) {
|
||||
return Path.Combine(Path.Combine(descriptor.Location, descriptor.Name), "Views/Models/{0}.ascx");
|
||||
return Path.Combine(Path.Combine(descriptor.Location, descriptor.Name), "Views/Shared/{0}.ascx");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user