Skip to content

Commit 75aab06

Browse files
author
zzy
committed
fff
1 parent b0973cf commit 75aab06

File tree

8 files changed

+221
-62
lines changed

8 files changed

+221
-62
lines changed

‎src/Redwood/WebBundle/Controller/JswidgetController.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ public function showAction(Request $request, $id)
2525
if(!$jswidget){
2626
return $this->createMessageResponse('info', "非常抱歉，组件id:{$id} 未找到, 15秒后将自动跳转到组件首页.",'', 15,$this->generateUrl('jswidget_show'));
2727
}
28+
$tagsArr = $this->getTagService()->getTagsByIds($jswidget['tags']);
29+
2830

2931
return $this->render('RedwoodWebBundle:Jswidget:content.html.twig', array(
3032
'jswidget' => $jswidget,
33+
'tags' => $tagsArr,
3134
'author' => $this->getUserService()->getUser($jswidget['userId'])
3235
));
3336
}
@@ -75,10 +78,11 @@ public function editAction(Request $request, $id)
7578

7679
$tagsArr = $this->getTagService()->getTagsByIds($jswidget['tags']);
7780
$tags = ArrayToolkit::column($tagsArr, 'name');
81+
$tags = join($tags, ',');
7882

7983
return $this->render('RedwoodWebBundle:Jswidget:create.html.twig', array(
8084
'user' => $user,
81-
'tags' => join($tags, ','),
85+
'tags' => $tags,
8286
'jswidget' => $jswidget
8387
));
8488
}

‎src/Redwood/WebBundle/Resources/public/css/subm.css‎

Lines changed: 94 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,13 @@ h2[id],h3[id],h4[id],h5[id] {
100100
}
101101

102102
h1 {
103-
font-size: 3em;
103+
/*font-size: 3em;*/
104104
margin-bottom: .5em;
105105
margin-left: -3px;
106106
margin-top: 0
107+
108+
font-size: 2.5em;
109+
line-height: 2em;
107110
}
108111

109112
h2 {
@@ -1281,9 +1284,9 @@ body.package div.labels span.title {
12811284
}
12821285

12831286
body.package div.labels a {
1284-
color: #555E69;
1287+
/* color: #555E69;
12851288
border-bottom: 1px solid #bbb
1286-
}
1289+
*/}
12871290

12881291
body.package div#details {
12891292
-moz-box-sizing: border-box;
@@ -1321,7 +1324,7 @@ body.package div#details ul.meta li {
13211324
}
13221325

13231326
body.package div#details ul.meta li.last_seen>*,body.package div#details ul.meta li.modified>* {
1324-
padding-top: 10px
1327+
/*padding-top: 10px*/
13251328
}
13261329

13271330
body.package div#details ul.meta li.last_seen>*,body.package div#details ul.meta li.first_seen>* {
@@ -1983,15 +1986,20 @@ span.versions {
19831986
}
19841987

19851988
span.versions.only {
1986-
background-color: #bbb;
1989+
background-color:#AABF7C;
19871990
color: #fff
19881991
}
19891992

19901993
span.versions.both {
1991-
background-color: #AABF7C;
1994+
background-color: #F1C090;
19921995
color: #fff
19931996
}
19941997

1998+
span.versions.onlycss {
1999+
background-color: #bbb;
2000+
color: #fff;
2001+
}
2002+
19952003
span.platforms,ul.packages li span.platforms,body.package div.meta span.platforms {
19962004
white-space: nowrap
19972005
}
@@ -4202,4 +4210,84 @@ a .icon-flip-vertical:before {
42024210
}
42034211
.select2-results li {
42044212
margin-left: 0px;
4213+
}
4214+
4215+
4216+
/*tag */
4217+
.labels .tag {
4218+
display: inline-block;
4219+
border: 1px solid;
4220+
border-radius: 3px;
4221+
height: 22px;
4222+
max-width: 100%;
4223+
padding: 0.1em 0.5em 0.2em 12.24264px;
4224+
margin-bottom: .25em;
4225+
margin-left: 11px;
4226+
box-sizing: border-box;
4227+
position: relative;
4228+
font-size: 12px;
4229+
white-space: nowrap;
4230+
text-decoration: none;
4231+
vertical-align: baseline;
4232+
}
4233+
.labels .tag span {
4234+
display: inline-block;
4235+
overflow: hidden;
4236+
max-width: 100%;
4237+
text-overflow: ellipsis;
4238+
}
4239+
.labels .tag:before {
4240+
content: '';
4241+
display: inline-block;
4242+
border-radius: 3px;
4243+
border-bottom-left-radius: 4px;
4244+
border-color: inherit;
4245+
border-left: 1.25px solid;
4246+
border-bottom: 1.2px solid;
4247+
background-color: inherit;
4248+
height: 17.21371px;
4249+
width: 17.21371px;
4250+
box-sizing: border-box;
4251+
position: absolute;
4252+
top: -2.24264px;
4253+
left: 1px;
4254+
z-index: 2;
4255+
-moz-transform-origin: left top;
4256+
-ms-transform-origin: left top;
4257+
-webkit-transform-origin: left top;
4258+
transform-origin: left top;
4259+
-moz-transform: rotate(45deg);
4260+
-ms-transform: rotate(45deg);
4261+
-webkit-transform: rotate(45deg);
4262+
transform: rotate(45deg);
4263+
}
4264+
.labels .tag:after {
4265+
content: '';
4266+
display: block;
4267+
background-color: #fff;
4268+
border-radius: 100%;
4269+
border: 1px solid;
4270+
height: 4px;
4271+
width: 4px;
4272+
position: absolute;
4273+
left: 1px;
4274+
top: 8px;
4275+
z-index: 3;
4276+
}
4277+
4278+
.labels .tag-green {
4279+
background-color: #AACD4E;
4280+
color: #FFFFFF;
4281+
font-weight: bold;
4282+
margin-top:10px;
4283+
}
4284+
.labels .tag-green, .tag-green:before, .tag-green:after {
4285+
border-color: #A1BD57;
4286+
}
4287+
.labels .tag-green[href]:hover, .tag-green[href]:focus, .tag-green .hover:hover, .tag-green .hover:focus {
4288+
background-color: #9EBE48;
4289+
color: #fff;
4290+
}
4291+
.labels .tag-green[href]:hover, .tag-green[href]:hover:before, .tag-green[href]:hover:after, .tag-green[href]:focus, .tag-green[href]:focus:before, .tag-green[href]:focus:after, .tag-green .hover:hover, .tag-green .hover:hover:before, .tag-green .hover:hover:after, .tag-green .hover:focus, .tag-green .hover:focus:before, .tag-green .hover:focus:after {
4292+
border-color: #A1BD57;
42054293
}

‎src/Redwood/WebBundle/Resources/public/js/controller/jswidget/create.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ define(function(require, exports, module) {
1515
},
1616

1717
'jswidget_url': "required",
18-
'jswidget_description': "required"
1918
},
2019
messages: {
2120
'jswidget_title':{
2221
required: "请输入标题",
2322
minlength: "标题的最小长度为2"
2423
},
2524
'jswidget_url': "请输入URL",
26-
'jswidget_description': "请输入一句话描述"
2725
}
2826
});
2927

‎src/Redwood/WebBundle/Resources/views/Jswidget/content.html.twig‎

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@
1212
<h1>{{ jswidget.title }}
1313

1414
{% if app.user and app.user.id == author.id %}
15-
<a href="{{ path('jswidget_edit', {id:jswidget.id}) }}" class="btn btn-link"><span class="glyphicon glyphicon-edit"></span> {{'编辑'}}</a>
16-
{% endif %}</h1>
15+
<a style="padding: 0; padding-top: 20px;" href="{{ path('jswidget_edit', {id:jswidget.id}) }}" class="btn btn-link"><span class="glyphicon glyphicon-edit"></span> {{'编辑'}}</a>
16+
{% endif %}
17+
</h1>
18+
1719
<div class="meta">
1820
<span class="author">
1921
<em>by</em>
20-
<a href="/browse/authors/iTitou">{{ author.username }}</a>
22+
<a href="javascript:;">{{ author.username }}</a>
2123

2224
</span>
23-
<!-- <span class="versions both" title="Works with Sublime Text 2 and 3">ST2/ST3</span> -->
25+
26+
{{ web_macro.jswidget_compatible(jswidget, false) }}
27+
28+
{{ web_macro.jswidget_type(jswidget) }}
29+
2430
</div>
2531

2632
<div class="meta" style="display:none;">
@@ -29,30 +35,37 @@
2935
<span>点赞</span>
3036
<span>{{ jswidget.admire }}</span>
3137
</div>
32-
<p class="description">
33-
{{ jswidget.description }}
34-
</p>
35-
<p class="description">
36-
<span>组件根目录</span>
37-
<a href="{{ jswidget.url }}" title="在测试服务器172.20.204.24上">{{ jswidget.url }}</a>
38-
</p>
39-
<!-- <div class="labels">
40-
<span class="title">Labels</span><a href="/browse/labels/auto-complete">auto-complete</a>, <a href="/browse/labels/language%20syntax">language syntax</a>
41-
</div> -->
38+
39+
{% if jswidget.description %}
40+
<p class="description">
41+
{{ jswidget.description }}
42+
</p>
43+
{% endif %}
44+
45+
{% if app.user and app.user.id == author.id %}
46+
<p class="description">
47+
<span>组件根目录: {{ jswidget.url }}</span>
48+
</p>
49+
{% endif %}
50+
4251
<div id="details">
4352
<h2>Details</h2>
4453
<ul class="meta">
45-
<!-- <li class="version">
46-
<label>Version</label><span>1.1.0</span>
47-
</li> -->
48-
49-
<li class="modified"><label>上一次修改</label><span>{{ jswidget.updateTime|date('Y-n-d H:i:s') }}</span></li>
50-
<li class="first_seen"><label>创建时间</label><span>{{ jswidget.createTime|date('Y-n-d H:i:s') }}</span></li>
54+
<li class="modified"><label>最近修改</label><span>{{ jswidget.updateTime|date('Y-m-d H:i:s') }}</span></li>
55+
<li class="first_seen"><label>创建时间</label><span>{{ jswidget.createTime|date('Y-m-d H:i:s') }}</span></li>
5156
</ul>
5257
</div>
5358
<div id="installs">
54-
<h2>unknown</h2>
55-
<ul class="totals">
59+
60+
<h2>标签</h2>
61+
<div class="labels " style="clear:both; width:100%; background:none;" >
62+
{% for tag in tags %}
63+
<a class="tag tag-green" href="#!">{{ tag.name }}</a>
64+
{% endfor %}
65+
</div>
66+
<div style="clear:both"></div>
67+
<!-- @todo 趋势 -->
68+
<!-- <ul class="totals">
5669
<li>
5770
<span class="total">Total</span> <span title="68" class="installs">--</span>
5871
</li>
@@ -65,12 +78,21 @@
6578
<li>
6679
<span class="platform">属性3</span> <span title="9" class="linux installs">-- <span class="key"></span></span>
6780
</li>
68-
</ul>
81+
</ul> -->
6982
</div>
7083
<div style="clear: both">
7184
</div>
7285

86+
<div id="readme">
87+
<h2>Readme</h2>
88+
<div class="contents">
89+
{{ jswidget.content|default('还没有详细介绍') }}
90+
</div>
91+
</div>
92+
7393
{% if jswidget.iframeUrl %}
94+
95+
7496
<div>
7597
<h2>Iframe 预览 <span><a style="border-bottom: 1px solid #eee;
7698
color: #555E69; font-size:14px;" href="{{ jswidget.iframeUrl }}" target="_blank">新窗口打开</a></span></h2>
@@ -80,12 +102,7 @@
80102
</div>
81103
{% endif %}
82104

83-
<div id="readme">
84-
<h2>Readme</h2>
85-
<div class="contents">
86-
{{ jswidget.content }}
87-
</div>
88-
</div>
105+
89106
</div>
90107

91108
{% endblock %}

‎src/Redwood/WebBundle/Resources/views/Jswidget/create.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<div class="col-md-7 controls">
4242
<input type="text" id="jswidget_description" name="description" data-display="description" class="form-control" value="{{ jswidget.description|default('') }}">
43-
<div class="help-block" style="display:none;"></div>
43+
<div class="help-block">请一句话描述下您的组件</div>
4444
</div>
4545
</div>
4646

@@ -74,7 +74,7 @@
7474
<label class="col-md-2 control-label">兼容性</label>
7575
<div class="col-md-8 controls radios">
7676
{{ radios('compatible', {'unsure':'未知', 'all':'各平台全兼容', 'mobile':'仅手机', 'pc7':'仅电脑IE7以上', 'pc6':'仅电脑IE6以上'}, jswidget.compatible|default('unsure')) }}
77-
<div class="help-block">电脑IE6以上:一般是一些PC客户端项目要求IE6以上.</div>
77+
<div class="help-block">电脑IE6以上:一般是一些PC客户端项目要求IE6以上; 不确定兼容性, 别勉强哦</div>
7878
</div>
7979
</div>
8080

@@ -91,7 +91,7 @@
9191
<label class="col-md-2 control-label" for="jswidget_content">内容:</label>
9292

9393
<div class="col-md-7 controls">
94-
<textarea id="jswidget_content" name="content" style="height:200px;" data-display="内容" class="form-control">{{ jswidget.content|default('还没有详细介绍') }}</textarea>
94+
<textarea id="jswidget_content" name="content" style="height:200px;" data-display="内容" placeholder="详细介绍" class="form-control">{{ jswidget.content|default('') }}</textarea>
9595
<div class="help-block" style="display:none;"></div>
9696
</div>
9797
</div>

‎src/Redwood/WebBundle/Resources/views/Jswidget/jswidget-block.html.twig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
{# {{ admin_macro.user_link(user) }} #}
1818
{# {{ dict_text('userType', user.type) }} #}
1919

20-
<li><a href="{{ path('jswidget_content', {id:jswidget.id}) }}">{{ jswidget.title }}</a><span class="versions only" title="Only works with Sublime Text 3">3</span></li>
20+
<li>
21+
<a href="{{ path('jswidget_content', {id:jswidget.id}) }}">{{ jswidget.title|sub_text(20) }}</a>
22+
23+
{{ web_macro.jswidget_compatible(jswidget) }}
24+
</li>
2125
{% endfor %}
2226

2327
<!-- <li><a href="/packages/Intel%20HEX">Intel HEX</a><span class="versions only" title="Only works with Sublime Text 3">3</span></li>

0 commit comments

Comments
 (0)