diff --git a/ground/controllers/UserController.php b/ground/controllers/UserController.php index 0667a0b..3aa4ff9 100644 --- a/ground/controllers/UserController.php +++ b/ground/controllers/UserController.php @@ -24,21 +24,14 @@ class UserController extends Controller self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); self::addScript('/js/leaflet-0.7.3.js'); - self::addScript('http://api-maps.yandex.ru/2.0/?load=package.map&lang=ru-RU'); - self::addScript('/js/leaflet.markercluster.js'); - - self::addScript('/js/app.js?ver=' . App::getConfig('version')); - self::addScript('/js/mapPoint.js?ver=' . App::getConfig('version')); self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); + self::addStyle('/css/user.css?ver=' . App::getConfig('version')); self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); - self::addStyle('/css/leaflet-0.7.3.css'); - self::addStyle('/css/MarkerCluster.css'); - self::addStyle('/css/MarkerCluster.Default.css'); $articles = Article::model()->getAll(array('where'=>'`author`='.(int)$user->id)); diff --git a/ground/views/user/index.php b/ground/views/user/index.php index d500676..e78ed15 100644 --- a/ground/views/user/index.php +++ b/ground/views/user/index.php @@ -1,27 +1,45 @@
-
+
+
+ Персональный блог пользователя +
+
+ nick ?> +
+
+ В социальных сетях: +

+ Создано точек: getPointsCount() ?> +
+
+
-
-

nick ?>

+
+

Статьи:

-
-

Общая информация

- Имя: name ?>
- Ссылка на профиль с соц. сети: network?>
- Создано точек: getPointsCount() ?>
- -

Статьи:

- - title ?>
- - Пока нет статей. - + +
+ + photoId): ?> + + + + + + title ?> + text)), 0, 250, 'UTF-8') ?>… + читать далее » +
+ + Пока нет статей. + +
-
+
diff --git a/public/css/user.css b/public/css/user.css new file mode 100644 index 0000000..af0c93e --- /dev/null +++ b/public/css/user.css @@ -0,0 +1,13 @@ +.darkHeader {background-color: rgba(55,55,55, 0.8);margin-top: -10px; padding: 150px 50px; color: #fff; text-align: center;} +.darkHeader .topDiv {font-size: 20px;} +.darkHeader .userPic {font-size: 70px; font-family: Ubuntu, inherit;} +.darkHeader .userPic img {height: 70px; border-radius: 5px;} +.darkHeader .socialNetworks {margin-top: 10px;} +.darkHeader .socialNetworks img {height: 30px; margin: 0 5px;} + +.lightBody {background-color: rgba(255,255,255, 0.8);margin-top: 0px;padding-bottom: 30px;} + +.articlesList {} +.articlesList .article {border: solid 1px #ddd; border-radius: 3px; padding: 4px; margin-bottom: 5px;background-color: rgba(255,255,255, 0.8);} +.articlesList .article img {width: 100px; float: left; margin-right: 10px;} +.articlesList .article .h {font-size: 18px; font-weight: bold; display: block;} diff --git a/public/img/social/e.png b/public/img/social/e.png new file mode 100644 index 0000000..998500d Binary files /dev/null and b/public/img/social/e.png differ diff --git a/public/img/social/facebook.png b/public/img/social/facebook.png new file mode 100644 index 0000000..e0ebb58 Binary files /dev/null and b/public/img/social/facebook.png differ diff --git a/public/img/social/google.png b/public/img/social/google.png new file mode 100644 index 0000000..98d71e1 Binary files /dev/null and b/public/img/social/google.png differ diff --git a/public/img/social/lj.png b/public/img/social/lj.png new file mode 100644 index 0000000..019634b Binary files /dev/null and b/public/img/social/lj.png differ diff --git a/public/img/social/mailru.png b/public/img/social/mailru.png new file mode 100644 index 0000000..0ba7759 Binary files /dev/null and b/public/img/social/mailru.png differ diff --git a/public/img/social/ok.png b/public/img/social/ok.png new file mode 100644 index 0000000..0535ed0 Binary files /dev/null and b/public/img/social/ok.png differ diff --git a/public/img/social/r.png b/public/img/social/r.png new file mode 100644 index 0000000..f2ac597 Binary files /dev/null and b/public/img/social/r.png differ diff --git a/public/img/social/twitter.png b/public/img/social/twitter.png new file mode 100644 index 0000000..097a098 Binary files /dev/null and b/public/img/social/twitter.png differ diff --git a/public/img/social/vkontakte.png b/public/img/social/vkontakte.png new file mode 100644 index 0000000..e6de796 Binary files /dev/null and b/public/img/social/vkontakte.png differ diff --git a/public/img/social/yandex.png b/public/img/social/yandex.png new file mode 100644 index 0000000..a8518f0 Binary files /dev/null and b/public/img/social/yandex.png differ