diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/default.css | 3 | ||||
| -rw-r--r-- | view/css/widgets.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 55 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/focus.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/focus.php | 4 | ||||
| -rwxr-xr-x | view/tpl/cropbody.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/edpost_head.tpl | 22 | ||||
| -rw-r--r-- | view/tpl/menuedit.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 71 | ||||
| -rw-r--r-- | view/tpl/mitemlist.tpl | 61 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 2 |
14 files changed, 131 insertions, 108 deletions
diff --git a/view/css/default.css b/view/css/default.css index fb6705894..e1edc2cbf 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -17,12 +17,11 @@ main { aside { display: table-cell; vertical-align: top; - padding: 65px 7px 0px 7px; + } section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 7px 200px 7px; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 63c380c75..5b6e8aeb9 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -39,7 +39,7 @@ padding: 5px; width: 100%; resize: vertical; - height: 150px; + height: 250px; } /* saved searches */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 716298845..a44cf331c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -28,12 +28,17 @@ aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; + padding: 80px 7px 0px 7px; } main { max-width: $main_widthpx; } +section { + padding: 80px 7px 200px 7px; +} + h1, .h1, h2, .h2 { font-size: 1.667em; } @@ -264,12 +269,20 @@ footer { } /*TODO: we should use one class for all this. */ -/* -.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { - color: #444 !important; - text-decoration: none !important; + +.group-selected, +.fileas-selected, +.categories-selected, +.search-selected, +.active, +.group-selected:hover, +.fileas-selected:hover, +.categories-selected:hover, +.search-selected:hover, +.active:hover { + color: $font_colour; } -*/ + .fileas-all { text-decoration: none !important; @@ -347,7 +360,8 @@ footer { word-wrap: break-word; } -.vcard dl { +.vcard dl, +.vcard .title { margin-top: 10px; margin-bottom: 0px; } @@ -406,13 +420,14 @@ footer { #profile-photo-wrapper img { - padding: 10px; - width: 197px; - height: 197px; + width: 100%; + max-width: 300px; + height: auto; } #profile-photo-wrapper { - margin-top: 10px; + margin-top: -10px; + margin-bottom: 10px; } @@ -571,7 +586,7 @@ footer { } .photo { - border: 1px solid #AAAAAA; + border: 1px solid #ccc; } .photo-top-photo, .photo-album-photo { @@ -704,8 +719,8 @@ a.rateme, div.rateme { .contact-block-div { float: left; - width: 49px; - height: 49px; + width: 50px; + height: 50px; } .contact-block-textdiv { float: left; @@ -720,8 +735,8 @@ a.rateme, div.rateme { float: left; } .contact-block-img { - width:47px; - height:47px; + width:48px; + height:48px; } #tag-remove { @@ -1587,8 +1602,8 @@ img.mail-list-sender-photo { } .jothidden > input { - border: 1px solid $bgcolour; - background-color: $bgcolour; + border: 1px solid transparent; + background-color: transparent; } .jothidden > input:hover, .jothidden > input:focus { @@ -2109,9 +2124,15 @@ nav .badge.mail-update:hover { } @media screen and (max-width: 767px) { + + section { + padding: 65px 7px 200px 7px; + } + aside#region_1 { background: rgba(0, 0, 0, .1); border-right: 1px solid $nav_bd; + padding: 65px 7px 0px 7px; } main { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 68190778c..302efc365 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 231 ); + $('main').css('width', $(window).width() + 285 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e68d38d5..96dba59e5 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 231; + $aside_width = 285; // left aside and right aside are is 231px + converse width if($converse_center) { diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css index 3d64b8a7d..ea983ffc8 100644 --- a/view/theme/redbasic/schema/focus.css +++ b/view/theme/redbasic/schema/focus.css @@ -16,10 +16,6 @@ background-color: #fff; } -#redbasic_converse_center_container { - display: none; -} - .wall-item-conv { padding-top: 10px; padding-left: 10px; diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index 4186c9f64..1f1963764 100644 --- a/view/theme/redbasic/schema/focus.php +++ b/view/theme/redbasic/schema/focus.php @@ -46,7 +46,7 @@ if (! $radius) if (! $shadow) $shadow = "0"; if (! $converse_width) - $converse_width = "656"; + $converse_width = "790"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) @@ -61,5 +61,3 @@ else { $nav_float_min_opacity = (float) $nav_min_opacity; $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; } - -$converse_center = "1"; diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index da5b1e859..4794c0b83 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -25,8 +25,8 @@ 'croppa', { previewWrap: 'previewWrap', - minWidth: 175, - minHeight: 175, + minWidth: 300, + minHeight: 300, maxWidth: 640, maxHeight: 640, ratioDim: { x: 100, y:100 }, diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 20e597909..3be40e978 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,12 +1,14 @@ -<div class="section-title-wrapper"> - {{if $delete}} - <div class="pull-right"> - <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $delete}} + <div class="pull-right"> + <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <div id="webpage-editor" class="section-content-tools-wrapper"> + {{$editor}} </div> - {{/if}} - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -<div id="webpage-editor" class="section-content-tools-wrapper"> - {{$editor}} </div> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..0e5df2c47 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,4 +1,5 @@ {{if $header}} +<div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $menu_id}} <div class="pull-right"> @@ -27,3 +28,6 @@ <div class="clear"></div> </form> </div> +{{if $header}} +</div> +{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..8715d6391 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -<div class="section-title-wrapper"> - <h2>{{$header}}</h2> -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$header}}</h2> + </div> {{/if}} -<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > - <input type="hidden" name="menu_id" value="{{$menu_id}}" /> - {{if $mitem_id}} - <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - <datalist id="menu-names"> - {{foreach $menu_names as $menu_name}} - <option value="{{$menu_name}}"> - {{/foreach}} - </datalist> - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} - <div class="pull-right form-group"> - <div class="btn-group"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> - </button> - {{if $submit_more}} - <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> - {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + {{if $mitem_id}} + <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + <datalist id="menu-names"> + {{foreach $menu_names as $menu_name}} + <option value="{{$menu_name}}"> + {{/foreach}} + </datalist> + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} + <div class="pull-right form-group"> + <div class="btn-group"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{if $submit_more}} + <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> + {{/if}} + <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> + {{$aclselect}} </div> - {{$aclselect}} - </div> - </form> + <div class="clear"></div> + </form> + </div> +{{if $header}} </div> +{{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 4e606654f..8686d4204 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,35 +1,34 @@ -<div class="section-title-wrapper"> - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> + <div class="clear"></div> </div> - <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> - <div class="clear"></div> -</div> -{{$create}} + {{$create}} -{{if $mlist }} -<div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> - <table id="mitem-list-table"> - <tr> - <th width="1%">{{$nametitle}}</th> - <th width="96%">{{$targettitle}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - </tr> - {{foreach $mlist as $m }} - <tr id="mitem-list-item-{{$m.mitem_id}}"> - <td width="1%">{{$m.mitem_desc}}</td> - <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> - <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> - <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> - <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> - </tr> - {{/foreach}} - </table> + {{if $mlist }} + <div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> + <table id="mitem-list-table"> + <tr> + <th width="1%">{{$nametitle}}</th> + <th width="96%">{{$targettitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + </tr> + {{foreach $mlist as $m }} + <tr id="mitem-list-item-{{$m.mitem_id}}"> + <td width="1%">{{$m.mitem_desc}}</td> + <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> + <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> + <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + </tr> + {{/foreach}} + </table> + </div> + {{/if}} </div> -{{/if}} - - - diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 2964d9c4b..9eac48c6d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@ <div class="vcard"> - + <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> {{if $profile.edit}} <div class="dropdown"> <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> @@ -18,7 +18,6 @@ <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index ca0fe76be..2acbb24e4 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@ <div class="vcard"> -<div class="fn">{{$name}}</div> <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div> +<div class="fn">{{$name}}</div> </div> |