Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

- Big change in the form CSS

pull/5/head
Jaussoin Timothée 13 years ago
parent
f1dc49c1b3
commit
e489a04717
10 changed files with 309 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      install/part1.php
  2. 12
      system/Widget/widgets/Config/Config.php
  3. 24
      system/Widget/widgets/Login/Login.php
  4. 41
      system/Widget/widgets/Login/login.css
  5. 140
      system/Widget/widgets/Vcard/Vcard.php
  6. 3
      system/Widget/widgets/Vcard/vcard.css
  7. 159
      themes/movim/css/forms.css
  8. 7
      themes/movim/css/posts.css
  9. 10
      themes/movim/css/style2.css
  10. 1
      themes/movim/page.tpl

2
install/part1.php
View File

@ -25,7 +25,7 @@
<body>
<div id="content" style="width: 900px">
<div id="left" style="width: 230px; padding-top: 10px;">
<div class="warning">
<div class="message warning">
<p><?php echo t('Thank you for downloading Movim!');?></p>
<p><?php echo t('Before you enjoy your social network, a few adjustements are required.'); ?></p>
<p><?php echo t('Keep in mind that Movim is still under development and will handle many personal details. Its use can potentially endanger your data. Always pay attention to information that you submit.'); ?></p>

12
system/Widget/widgets/Config/Config.php
View File

@ -55,8 +55,9 @@ class Config extends WidgetBase
?>
<div id="config">
<form enctype="multipart/form-data" method="post" action="index.php" name="general">
<div class="element">
<label id="lock" for="language"><?php echo t('Language'); ?></label>
<div class="select">
<select name="language" id="language">
<option value="en">English (default)</option>
<?php
@ -68,12 +69,15 @@ class Config extends WidgetBase
<?php }
} ?>
</select>
</div>
</div>
<hr />
<input value="<?php echo t('Submit'); ?>" onclick="<?php echo $submit; ?>" type="button" class="button icon yes merged right" style="float: right;">
<input type="reset" value="<?php echo t('Reset'); ?>" class="button icon no merged left" style="float: right;">
<br />
<a onclick="<?php echo $submit; ?>" type="button" class="button icon yes merged right" style="float: right;"><?php echo t('Submit'); ?></a>
<!--<a type="reset" value="<?php echo t('Reset'); ?>" class="button icon no merged left" style="float: right;">-->
</p>
</form>
<br /><br />
<div class="message info"><?php echo t("This configuration is shared wherever you are connected !");?></div>
</div>
<?php

24
system/Widget/widgets/Login/Login.php
View File

@ -216,17 +216,21 @@ class Login extends WidgetBase {
name="login"
id="connectform"
onkeypress="if(event.keyCode == 13) {<?php echo $submit; ?> loginButtonSet('<?php echo t('Connecting...');?>');}">
<div class="element">
<input type="email" name="login" id="login" autofocus required
placeholder="<?php echo t("My address"); ?>"/>
</div>
<div class="element">
<input type="password" name="pass" id="pass" required
placeholder="<?php echo t("Password"); ?>"/>
</div>
<input type="email" name="login" id="login" autofocus required
placeholder="<?php echo t("My address"); ?>"/>
<input type="password" name="pass" id="pass" required
placeholder="<?php echo t("Password"); ?>"/>
<input
type="button"
onclick="<?php echo $submit; ?> loginButtonSet('<?php echo t('Connecting...');?>');"
id="submit"
name="submit" value="<?php echo t("Come in!"); ?>"/>
<a
class="button icon yes"
onclick="<?php echo $submit; ?> loginButtonSet('<?php echo t('Connecting...');?>');"
id="submit"
name="submit"><?php echo t("Come in!"); ?></a>
</form>
</div>
<?php

41
system/Widget/widgets/Login/login.css
View File

@ -22,7 +22,7 @@ body {
margin-top: -170px;
padding-top: 200px;
}
/*
#loginpage input {
background-color: white;
font-size: 1.4em;
@ -39,10 +39,47 @@ body {
color: white;
box-shadow: none;
}
*/
#connectform {
text-align: center;
margin: 0 auto;
width: 640px;
}
#connectform .element {
min-height: 0px;
max-width: 250px;
clear: none;
}
#connectform .element input {
max-width: auto;
font-size: 1.4em;
border: 1px solid #274950;
box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
padding: 0.1em 0.5em;
color: #15414A;
}
#connectform a[name=submit] {
border: 1px solid #274950;
background: -moz-linear-gradient(top, #6E9EA8 0%, #274950 100%);
background: -webkit-linear-gradient(top, #6E9EA8 0%, #274950 100%);
color: white;
box-shadow: none;
width: 100px;
font-size: 1.4em;
text-shadow: -1px -1px 1px #274950;
padding-top: 4px;
overflow: hidden;
padding-left: 20px;
float: right;
margin-top: 5px;
height: 30px;
}
#connectform a[name=submit]:before {
color: white;
}
#connectform span {

140
system/Widget/widgets/Vcard/Vcard.php
View File

@ -127,90 +127,109 @@ class Vcard extends WidgetBase
<fieldset class="protect red">
<legend>'.t('General Informations').'</legend>';
$html .= '<div class="element"><span>'.t('Name').'</span>
$html .= '<div class="element">
<label for="fn">'.t('Name').'</label>
<input type="text" name="fn" class="content" value="'.$me->getData('fn').'">
</div>';
$html .= '<div class="element"><span>'.t('Nickname').'</span>
$html .= '<div class="element">
<label for="name">'.t('Nickname').'</label>
<input type="text" name ="name" class="content" value="'.$me->getData('name').'">
</div>';
$html .= '<div class="element"><span>'.t('Date of Birth').'</span>';
$html .= '<select name="day" class="datepicker"><option value="-1">'.t('Day').'</option>';
for($i=1; $i<= 31; $i++){
if($i < 10){
$j = '0'.$i;
} else {
$j = $i;
}
if($i == substr( $me->getData('date'), 8)) {
$html .= '<option value="'.$j.'" selected>'.$j.'</option>';
} else {
$html .= '<option value="'.$j.'">'.$j.'</option>';
}
}
$html .= '</select>';
$html .= '<select name="month" class="datepicker"><option value="-1">'.t('Month').'</option>';
for($i=1; $i<= 12; $i++){
if($i < 10){
$j = '0'.$i;
} else {
$j = $i;
}
if($i == substr( $me->getData('date'), 5, 2)) {
$html .= '<option value="'.$j.'" selected>'.$j.'</option>';
} else {
$html .= '<option value="'.$j.'">'.$j.'</option>';
}
}
$html .= '</select>';
$html .= '<select name="year" class="datepicker"><option value="-1">'.t('Year').'</option>';
for($i=date('o'); $i>= 1920; $i--){
if($i == substr( $me->getData('date'), 0, 4)) {
$html .= '<option value="'.$i.'" selected>'.$i.'</option>';
} else {
$html .= '<option value="'.$i.'">'.$i.'</option>';
}
}
$html .= '</select></div>';
$html .= '<div class="element large">
<label for="day">'.t('Date of Birth').'</label>';
$html .= '
<div class="select">
<select name="day" class="datepicker">
<option value="-1">'.t('Day').'</option>';
for($i=1; $i<= 31; $i++){
if($i < 10){
$j = '0'.$i;
} else {
$j = $i;
}
if($i == substr( $me->getData('date'), 8)) {
$html .= '<option value="'.$j.'" selected>'.$j.'</option>';
} else {
$html .= '<option value="'.$j.'">'.$j.'</option>';
}
}
$html .= ' </select>
</div>';
$html .= '
<div class="select">
<select name="month" class="datepicker">
<option value="-1">'.t('Month').'</option>';
for($i=1; $i<= 12; $i++){
if($i < 10){
$j = '0'.$i;
} else {
$j = $i;
}
if($i == substr( $me->getData('date'), 5, 2)) {
$html .= '<option value="'.$j.'" selected>'.$j.'</option>';
} else {
$html .= '<option value="'.$j.'">'.$j.'</option>';
}
}
$html .= ' </select>
</div>';
$html .= '
<div class="select">
<select name="year" class="datepicker">
<option value="-1">'.t('Year').'</option>';
for($i=date('o'); $i>= 1920; $i--){
if($i == substr( $me->getData('date'), 0, 4)) {
$html .= '<option value="'.$i.'" selected>'.$i.'</option>';
} else {
$html .= '<option value="'.$i.'">'.$i.'</option>';
}
}
$html .= ' </select>
</div>
</div>';
$html .= '<br />
<div class="element"><span style="padding-top: 5px;">'.t('Gender').'</span>
<select name="gender">';
$html .= '<div class="element">
<label for="gender">'.t('Gender').'</label>
<div class="select"><select name="gender">';
foreach(getGender() as $key => $value) {
$html .= '<option ';
if($key == $me->getData('gender'))
$html .= 'selected ';
$html .= 'value="'.$key.'">'.$value.'</option>';
}
$html .= ' </select>
$html .= ' </select></div>
</div>';
$html .= '<div class="element"><span style="padding-top: 5px;">'.t('Marital Status').'</span>
<select name="marital">';
$html .= '<div class="element"><label for="marital">'.t('Marital Status').'</label>
<div class="select"><select name="marital">';
foreach(getMarital() as $key => $value) {
$html .= '<option ';
if($key == $me->getData('marital'))
$html .= 'selected ';
$html .= 'value="'.$key.'">'.$value.'</option>';
}
$html .= ' </select>
$html .= ' </select></div>
</div>';
$html .= '<br />
<div class="element"><span>'.t('Website').'</span>
$html .= '<div class="element"><label for="url">'.t('Website').'</label>
<input type="url" name ="url" class="content" value="'.$me->getData('url').'">
</div>';
$html .= '<br />
<div class="element"><span>'.t('Avatar').'</span>
$html .= '<div class="element"><label for="avatar">'.t('Avatar').'</label>
<input type="file" onchange="vCardImageLoad(this.files);">
<img id="vCardPhotoPreview" src="data:'.$me->getData('phototype').';base64,'.$me->getData('photobin').'">
<input type="hidden" name="phototype" value="'.$me->getData('phototype').'">
<input type="hidden" name="photobin" value="'.$me->getData('photobin').'"><br />
<span></span><input type="file" onchange="vCardImageLoad(this.files);">
</div>';
$html .= '<br />
<div class="element"><span>'.t('About Me').'</span>
$html .= '<div class="element large"><label for="desc">'.t('About Me').'</label>
<textarea name ="desc" class="content" onkeyup="movim_textarea_autoheight(this);">'.trim($me->getData('desc')).'</textarea>
</div>';
@ -220,18 +239,17 @@ class Vcard extends WidgetBase
<legend>'.t('Geographic Position').'</legend>';
$html .= '<div class="warning"><a class="button tiny" style="float: right;" onclick="getPos(this);">Récupérer ma position</a></div>';
$html .= '<div id="geolocation"></div>';
$html .= '<div class="element"><span>'.t('Latitude').'</span>
$html .= '<div class="element"><label>'.t('Latitude').'</label>
<input type="text" name="lat" class="content" value="Latitude" readonly>
</div>';
$html .= '<div class="element"><span>'.t('Longitude').'</span>
$html .= '<div class="element"><label>'.t('Longitude').'</label>
<input type="text" name="long" class="content" value="Longitude" readonly>
</div>';
$html .= '<hr />
</fieldset>';*/
$html .= '<input
value="'.t('Submit').'"
$html .= '<hr /><br />';
$html .= '<a
onclick="
'.$submit.' this.value = \''.t('Submitting').'\';
this.className=\'button icon loading merged right\'"
@ -242,8 +260,8 @@ class Vcard extends WidgetBase
$html .= 'yes';
$html .= ' merged right"
type="button" style="float: right;"
> ';
$html .= '<input type="reset" value="'.t('Reset').'" class="button icon no merged left" style="float: right;">';
>'.t('Submit').'</a>';
//$html .= '<a type="reset" class="button icon no merged left" style="float: right;">'.t('Reset').'</a>';
$html .= '

3
system/Widget/widgets/Vcard/vcard.css
View File

@ -2,7 +2,7 @@
padding: 1em 1.5em;
}
#vcard .element {
/*#vcard .element {
padding: 5px;
clear: both;
overflow: auto;
@ -56,3 +56,4 @@
float: left;
width: 80px;
}
*/

159
themes/movim/css/forms.css
View File

@ -0,0 +1,159 @@
form * {
margin: 0px;
padding: 0px;
float: none;
}
fieldset {
border: none;
margin-top: 20px;
border-top: 1px solid #DCDCDC;
}
legend {
float: left;
position: relative;
top: -25px;
clear: both;
}
form .element:nth-child(2) {
clear: both;
}
form .element {
overflow: auto;
min-height: 70px;
width: 50%;
float: left;
}
form .element > *:not(label):not(img) {
display: block;
width: 90%;
border: 1px solid #999;
min-height: 30px;
border-radius: 4px;
background-color: white;
box-shadow: inset 0 2px 1px #ddd;
margin: 5px 0px;
padding-left: 5px;
}
form .element > *:not(label):not(img):focus {
border: 1px solid gray;
box-shadow: inset 0 2px 2px #bbb;
}
form .element textarea, textarea {
padding: 10px 0px;
resize: vertical;
background-color: white;
}
form .element .select {
box-shadow: 0 1px 1px #ddd;
border-top: 1px solid #ccc;
border-bottom: 1px solid #888;
padding: 0px;
height: 20px;
position: relative;
overflow: hidden;
background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.04) 2px);
background-color: white;
background-size: 100% 100%;
}
form .element .select:hover {
box-shadow: 0px 1px 1px #ccc;
border: 1px solid gray;
}
form .element .select select {
width: 107%;
background-color: transparent;
display: block;
padding-top: 5px;
padding-left: 5px;
height: 30px;
}
form .element .select:before {
content: "▶";
font: 11px sans-serif;
font-weight: bold;
color: #444;
right: 0px;
transform: rotate(90deg);
-moz-transform: rotate(90deg);
padding: 8px;
position: absolute;
display: block;
}
form .element .select select option {
height: 20px;
padding: 5px;
}
input[type=submit], input[type=reset], input[type=button], .button, .button:link, .button:visited {
display: block;
border: 1px solid #999;
border-radius: 4px;
box-shadow: 0 1px 1px #ddd;
border-top: 1px solid #ccc;
border-bottom: 1px solid #888;
padding: 0px 10px;
position: relative;
overflow: hidden;
background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.04) 2px);
background-color: white;
background-size: 100% 100%;
}
input:hover[type=submit], input[type=reset]:hover, input[type=button]:hover, .button:hover {
box-shadow: 0px 1px 1px #ccc;
border: 1px solid gray;
cursor: pointer;
}
.button.icon {
padding-left: 35px;
background-repeat: no-repeat;
line-height: 28px;
position: relative;
overflow: hidden;
}
.button.icon:before {
content: "✘";
font: 14px sans-serif;
font-weight: bold;
color: #444;
left: 0px;
padding: 6px 10px;
position: absolute;
}
.icon.yes:before { content: "✔"; }
.icon.no:before { content: "✘"; }
.icon.bubble { background-image: url(../img/icons/comments_icon.png); }
.icon.bubbleadd { background-image: url(../img/icons/comments_add.png); }
.icon.bubbleold { background-image: url(../img/icons/comments_show.png); }
.icon.follow { background-image: url(../img/icons/follow_icon.png); }
.icon.chat{ background-image: url(../img/icons/chat_icon.png); }
.icon.add { background-image: url(../img/icons/add_icon.png); }
.icon.rm { background-image: url(../img/icons/rm_icon.png); }
.icon.submit:before { content: "▼"; }
.icon.loading:before { content: "◕"; }
.tiny.icon {
font-size: 11px;
line-height: 22px;
padding-left: 23px;
}
.tiny.icon:before {
padding: 5px 6px;
font-size: 11px;
}

7
themes/movim/css/posts.css
View File

@ -166,13 +166,6 @@
color: #333;
}
label {
float:left;
text-align:right;
width: auto;
padding: 5px 9px 5px 9px;
}
.post table#commentsubmit {
border-spacing: 0px;
background-color: white;

10
themes/movim/css/style2.css
View File

@ -66,8 +66,9 @@ hr {
border: 0px;
background-color: #DCDCDC;
height: 1px;
margin: 10px 0px;
padding: 0px;
clear: both;
line-height: 20px;
}
h1 {
@ -194,7 +195,7 @@ span#widgettitle {
}
/* Formulaires */
/*
form p {
margin-bottom: 5px;
display: block;
@ -312,7 +313,7 @@ label {
text-align:right;
width: 25%;
padding: 5px 9px 5px 9px;
}
}*/
/* The navigation bar */
@ -386,13 +387,14 @@ label {
background-image: linear-gradient(135deg, rgba(255,255, 255, 0.05) 25%, transparent 25%,
transparent 50%, rgba(255,255, 255, 0.05) 50%, rgba(255,255, 255, 0.05) 75%,
transparent 75%, transparent);
bax-shadow: inset 0 -1px 0 rgba(255,255, 255, 0.4);
box-shadow: inset 0 -1px 0 rgba(255,255, 255, 0.4);
border: 1px solid;
color: #fff;
padding: 10px;
text-shadow: 0px 1px 0 rgba(0, 0, 0, 0.1);
font-size: 1.1em;
margin: 5px 0px;
clear: both;
}
.message.warning {

1
themes/movim/page.tpl
View File

@ -9,6 +9,7 @@
<?php
$this->addCss('css/style2.css');
$this->addCss('css/posts.css');
$this->addCss('css/forms.css');
$this->addCss('css/animations.css');
?>
<?php $this->scripts();?>

Write Preview
Loading…
Cancel
Save