Merge remote-tracking branch 'invitation_style'

This commit is contained in:
Dmitriy Simushev 2014-05-28 09:22:30 +00:00
commit 078bf1c1fc
12 changed files with 108 additions and 56 deletions

View File

@ -36,16 +36,6 @@ class InvitationStyle extends AbstractStyle implements StyleInterface
return 'styles/invitations/' . $this->getName();
}
/**
* Loads configurations of the style.
*
* @return array Style configurations
*/
public function getConfigurations()
{
return array();
}
/**
* Stub for StyleInterface::render method.
*

View File

@ -28,15 +28,26 @@ $style_list = InvitationStyle::getAvailableStyles();
$preview = verify_param("preview", "/^\w+$/", "default");
if (!in_array($preview, $style_list)) {
$style_names = array_keys($style_list);
$preview = $style_list[0];
}
$invitation_style = new InvitationStyle($preview);
$style_config = $invitation_style->getConfigurations();
$screenshots = array();
foreach ($style_config['screenshots'] as $name => $desc) {
$screenshots[] = array(
'name' => $name,
'file' => (MIBEW_WEB_ROOT . '/' . $invitation_style->getFilesPath()
. '/screenshots/' . $name . '.png'),
'description' => $desc
);
}
$page['formpreview'] = $preview;
$page['preview'] = $preview;
$page['availablePreviews'] = $style_list;
$page['operatorName'] = (empty($operator['vclocalname'])
? $operator['vccommonname']
: $operator['vclocalname']);
$page['screenshotsList'] = $screenshots;
$page['title'] = getlocal("page.preview.title");
$page['menuid'] = "settings";

View File

@ -25,6 +25,10 @@ body {
min-width: 500px;
background-color: #F1F2F2;
}
body.invitation {
min-width: 0;
min-height: 0;
}
a {
text-decoration: underline;
color: #008AD9;
@ -481,7 +485,7 @@ ul li {
#invitation-messages-region {
height: 150px;
min-height: 150px;
width: 398px;
width: 388px;
overflow-y: auto;
padding: 0px;
font: normal 10px Tahoma;

View File

@ -8,7 +8,7 @@
{{#block "head"}}{{/block}}
</head>
<body>
<body{{#if startFrom}} class="{{startFrom}}"{{/if}}>
{{#block "page"}}
{{! Logo block}}
<div id="top2">

View File

@ -0,0 +1,3 @@
<FilesMatch "\.ini$">
Deny from all
</FilesMatch>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 B

View File

@ -0,0 +1,10 @@
; This file determines some invitation style options
; Comments starts with ';'
; Screenshots section describe all screenshots shiped with style
; Params names should be equals to file names without extension. Pictures
; extension should be '.png'
; Params values should be equals to screenshot desription
[screenshots]
invitation = "Appearance of the invitation"
location = "Location of the invitation on a page"

View File

@ -22,40 +22,57 @@
font-weight: normal !important;
font-style: normal !important;
font-family: Arial, Helvetica, sans-serif !important;
font-size: 12px !important;
font-size: 14px !important;
vertical-align: baseline !important;
line-height: normal !important;
border: 1px solid #aaa !important;
background-color: #ddd !important;
background: -webkit-linear-gradient(left, #dfdfdf, #fafafa) !important;
background: -o-linear-gradient(right, #dfdfdf, #fafafa) !important;
background: -moz-linear-gradient(right, #dfdfdf, #fafafa) !important;
background: linear-gradient(to right, #dfdfdf, #fafafa) !important;
color: #000 !important;
position: fixed !important;
top: 50% !important;
left: 0 !important;
bottom: 5px !important;
right: 5px !important;
width: 400px !important;
z-index: 100 !important;
border-radius: 10px !important;
-webkit-border-radius: 10px !important;
-moz-border-radius: 10px !important;
box-shadow: 0 1px 1px 1px #ddd !important;
-moz-box-shadow: 0 1px 1px 1px #ddd !important;
-webkit-box-shadow: 0 1px 1px 1px #ddd !important;
}
#mibewinvitationpopup h1, #mibewinvitationpopup p, #mibewinvitationclose a {
cursor: pointer !important;
}
#mibewinvitationpopup h1{
#mibewinvitationpopup h1 {
color: #909090 !important;
font-size: 20px !important;
font-weight: bold !important;
max-width: 220px !important;
overflow: hidden !important;
margin-top: 10px !important;
margin-bottom: 10px !important;
background: url('./24x24.png') 7px 1px no-repeat !important;
text-align: left !important;
padding-left: 40px !important;
display: inline-block !important;
}
#mibewinvitationclose {
float: right !important;
background-color: red !important;
background: url('./close.gif') center no-repeat !important;
padding: 1px !important;
margin: 0 !important;
}
#mibewinvitationclose a {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif !important;
font-size: 20px !important;
font-weight: bold !important;
font-size: 12px !important;
font-weight: normal !important;
color: white !important;
margin: 0 4px 0 4px !important;
}
@ -64,31 +81,57 @@
text-decoration: none !important;
}
#mibewinvitationpopup h1 {
text-align: center !important;
}
#mibewinvitationpopup p {
padding: 2px !important;
margin: 2px !important;
}
#mibewinvitationavatar {
margin: 2px !important;
margin-right: 5px !important;
margin: 2px 10px 5px 2px !important;
cursor: pointer !important;
float: left !important;
float: right !important;
max-width: 100px !important;
}
#mibewinvitationframe {
width: 398px;
height: 150px;
overflow: hidden;
border: 1px solid #000;
background-color: #FFFFFF;
width: 388px !important;
height: 150px !important;
overflow: hidden !important;
border: 1px solid #bbc4c4 !important;
background-color: #ffffff !important;
padding: 5px !important;
border-radius: 5px !important;
-webkit-border-radius: 5px !important;
-moz-border-radius: 5px !important;
margin-bottom: 5px !important;
}
#mibewinvitationaccept {
font-weight: bold;
text-align: center;
cursor: pointer;
color: #495151 !important;
font-size: 17px !important;
font-weight: normal !important;
text-align: center !important;
cursor: pointer !important;
background: -webkit-linear-gradient(#fff, #dfdfdf) !important;
background: -o-linear-gradient(#fff, #dfdfdf) !important;
background: -moz-linear-gradient(#fff, #dfdfdf) !important;
background: linear-gradient(#fff, #dfdfdf) !important;
border: 1px solid #777 !important;
border-radius: 7px !important;
-webkit-border-radius: 7px !important;
-moz-border-radius: 7px !important;
box-shadow: 0 2px 2px 2px #ddd !important;
-moz-box-shadow: 0 2px 2px 2px #ddd !important;
-webkit-box-shadow: 0 2px 2px 2px #ddd !important;
display: inline-block !important;
float: right !important;
padding: 5px 65px !important;
}
#mibewinvitationaccept:hover {
color: black !important;
background: -webkit-linear-gradient(#e9f6fc, #c6e5f6) !important;
background: -o-linear-gradient(#e9f6fc, #c6e5f6) !important;
background: -moz-linear-gradient(#e9f6fc, #c6e5f6) !important;
background: linear-gradient(#e9f6fc, #c6e5f6) !important;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -1,13 +1,8 @@
{{#extends "_layout"}}
{{#override "menu"}}{{> _menu}}{{/override}}
{{#override "head"}}
<link href="{{mibewRoot}}/styles/invitations/{{preview}}/invite.css" rel="stylesheet" type="text/css" />
{{/override}}
{{#override "content"}}
{{l10n "page.preview.intro"}}
<br />
<br />
@ -32,6 +27,14 @@
</select>
</div>
</div>
{{#each screenshotsList}}
<div class="field">
<div class="flabel">{{description}}</div>
<div class="fvalueframe">
<img class="screenshot" alt="{{name}}" src="{{file}}" />
</div>
</div>
{{/each}}
</div>
</div>
@ -41,17 +44,5 @@
</div>
</div>
</form>
<div id="mibewinvitation">
<div id="mibewinvitationpopup">
<div id="mibewinvitationclose">
<a onclick="void(0);" href="javascript:void(0);">&times;</a>
</div>
<h1 onclick="void(0);">{{operatorName}}</h1>
<div id="mibewinvitationframe">{{l10n "invitation.message"}}</div>
<div id="mibewinvitationaccept" onclick="void(0);">{{l10n "invitation.accept.caption"}}</div>
<div style="clear: both;"></div>
</div>
</div>
{{/override}}
{{/extends}}