From e45a654715c5db44e60527513d7d8255f8d20221 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 17:46:24 +0000 Subject: cleaned up and standardized the css markup --- views/default/object/album.php | 4 +- views/default/object/image.php | 8 +- views/default/tidypics/css.php | 198 +++++++++++-------------- views/default/tidypics/forms/edit_multi.php | 6 +- views/default/tidypics/forms/upload.php | 2 +- views/default/tidypics/groupprofile_albums.php | 12 +- views/default/widgets/album_view/view.php | 14 +- 7 files changed, 112 insertions(+), 132 deletions(-) (limited to 'views') diff --git a/views/default/object/album.php b/views/default/object/album.php index a94f12590..63e60a339 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -21,9 +21,9 @@ //get album cover if one was set if($file->cover) - $album_cover = 'thumbnail'; + $album_cover = 'thumbnail'; else - $album_cover = 'new album'; + $album_cover = 'new album'; ?>
diff --git a/views/default/object/image.php b/views/default/object/image.php index 67fd87bfb..3aa9bab8e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -19,7 +19,7 @@ if (get_input('search_viewtype') == "gallery") { ?> -
+
thumbnail
-
+
thumbnail
' . autop($desc) . '
'; - echo '
'; - echo '
' . $back . $next . '
'; + echo '
'; + echo '
' . $back . $next . '
'; if ($next) echo ''; echo '' . $title . ''; if ($next) echo ''; diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 3c935e8c5..44590b676 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -3,145 +3,130 @@ * tidypics CSS extender */ ?> - /* --- independent view for image/album SHARED --- */ - -#tidypics_title{ - font-size:1.2em; - font-weight:bold; -} -#tidypics_desc{ - padding:0 20px; - font-style:italic; -} -#tidypics_info{ - padding:20px; - line-height:1.5em; +/* ---- tidypics object views ---- */ + +#tidypics_desc { +padding:0 20px; +font-style:italic; } -#tidypics_controls{ - text-align:center; - margin-bottom:10px; +#tidypics_info { +padding:20px; } -#tidypics_controls a{ - margin:10px; +#tidypics_controls { +text-align:center; +margin-bottom:10px; } -#group_albums_widget { --webkit-border-radius: 8px; --moz-border-radius: 8px; -background:white none repeat scroll 0 0; -margin:0 0 20px; -padding:0 0 5px; +#tidypics_controls a { +margin:10px; } .tidypics_download a { - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: white; - background:#4690d6; - border:none; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - width: auto; - height: 25px; - padding: 3px 6px 3px 6px; - margin:10px 0 10px 0; - cursor: pointer; +font:12px/100% Arial, Helvetica, sans-serif; +font-weight:bold; +color:white; +background:#4690d6; +border:none; +-webkit-border-radius: 5px; +-moz-border-radius: 5px; +width:auto; +height:25px; +padding:3px 6px 3px 6px; +margin:10px 0 10px 0; +cursor:pointer; } + .tidypics_download a:hover { - background: black; - color:white; - text-decoration: none; +background:black; +color:white; +text-decoration:none; } - - /* independent album view only */ - -.album_images{ - float:left; - width:160px; - height:160px; - margin:4px; - padding:5px; - border:1px solid #cccccc; - text-align:center; +.tidypics_album_images { +float:left; +width:153px; +height:153px; +margin:3px; +padding:4px; +border:1px solid #dedede; +text-align:center; } - /* independent image view only */ - -#image_full{ - text-align:center; - margin:10px; -} -#image_full img{ - padding:5px; - border:1px solid #cccccc; - margin:7px 0; +#tidypics_image_full { +text-align:center; +margin:10px; } -/* --- albums gallery view --- */ - -.album_cover{ - padding:2px; - border:1px solid #cccccc; - margin:8px 0; +#tidypics_image_full img { +padding:5px; +border:1px solid #dedede; +margin:7px 0; } +.tidypics_album_cover { +padding:2px; +border:1px solid #dedede; +margin:8px 0; +} -/* ------ album WIDGET VIEW ------ */ - -#album_widget_container{ - text-align:center; +.tidypics_album_widget_single_item { +margin-bottom:8px; } -.album_widget_single_item{ +/* ------ tidypics widget view ------ */ +#tidypics_album_widget_container { +text-align:center; } -.album_widget_title{ -} -.album_widget_timestamp { - color:#666666; - margin:0; -} -.collapsable_box #album_widget_layout { - margin:0; +.tidypics_album_widget_timestamp { +color:#333333; } /* --------- image upload/edit forms ------------ */ -#image_upload_list li{ - margin:3px 0; +#tidpics_image_upload_list li { +margin:3px 0; } -.edit_image_container{ - padding:5px; - margin:5px 0; - overflow:auto; + +.tidypics_edit_image_container { +padding:5px; +margin:5px 0; +overflow:auto; } -.edit_images{ - float:right; - width:160px; - height:160px; - margin:4px; - padding:5px; - border:1px solid #cccccc; - text-align:center; + +.tidypics_edit_images { +float:right; +width:160px; +height:160px; +margin:4px; +padding:5px; +border:1px solid #dedede; +text-align:center; } -.image_info{ - float:left; - width:60%; + +.tidypics_image_info { +float:left; +width:60%; } -.image_info label{ - font-size:1em; + +.tidypics_image_info label { +font-size:1em; } -.edit_image{ - float:right; - border:1px solid #cccccc; - width:153px; - height:153px; + +/* ---- tidypics group css ----- */ + +#group_albums_widget { +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +background:white none repeat scroll 0 0; +margin:0 0 20px; +padding:0 0 5px; } + /* --------- tidypics river items ------------ */ .river_image_create { @@ -158,9 +143,4 @@ padding:0 0 5px; } .river_object_album_comment { background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} - -.pagination { - clear:both !important; -} - \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php index 354600798..24755e9cf 100644 --- a/views/default/tidypics/forms/edit_multi.php +++ b/views/default/tidypics/forms/edit_multi.php @@ -19,9 +19,9 @@ $container_guid = $entity->container_guid; if($no_cover && !$cover) $cover = $guid; - echo '
'; - echo '' . $title . ''; - echo '
'; + echo '
'; + echo '' . $title . ''; + echo '
'; echo '

'; echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n"; echo '

'; diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index f430fb04f..e93d3f5ba 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -49,7 +49,7 @@ function showhide(layer_ref) {

-
    +
      ' . elgg_view("input/file",array('internalname' => "upload_$x")) . "\n"; diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php index d975f5f99..de61b0845 100644 --- a/views/default/tidypics/groupprofile_albums.php +++ b/views/default/tidypics/groupprofile_albums.php @@ -15,19 +15,19 @@ if ($vars['entity']->photos_enable != 'no') { echo '

      ' . elgg_echo('albums') . '

      '; if ($owner_albums) { - echo '
      '; + echo '
      '; foreach($owner_albums as $album){ //get album cover if one was set if($album->cover) - $album_cover = 'album cover'; + $album_cover = 'album cover'; else - $album_cover = 'new album'; + $album_cover = 'new album'; ?> -
      -
      title;?>
      -
      time_created);?>
      +
      +
      title;?>
      +
      time_created);?>
      '; - + echo '
      '; + foreach($owner_albums as $album){ //get album cover if one was set if($album->cover) - $album_cover = '' . $album->title . ''; + $album_cover = '' . $album->title . ''; else - $album_cover = '' . $album->title . ''; + $album_cover = '' . $album->title . ''; ?> -
      -
      title;?>
      -
      time_created);?>
      +
      +
      title;?>
      +
      time_created);?>