Skip to content
Snippets Groups Projects
Commit c8c26bad authored by syuilo's avatar syuilo
Browse files

Fix

parent 5be6a843
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 31 deletions
src/web/app/auth/tags/form.tag
+ 1
− 1
View file @ c8c26bad
<mk-form>
<header>
<h1><i>{ app.name }</i>があなたの<b>アカウント</b>に<b>アクセス</b>することを<b>許可</b>しますか？</h1><img src={ app.icon_url + '?thumbnail&amp;size=64' }/>
<h1><i>{ app.name }</i>があなたの<b>アカウント</b>に<b>アクセス</b>することを<b>許可</b>しますか？</h1><img src={ app.icon_url + '?thumbnail&size=64' }/>
</header>
<div class="app">
<section>
......
src/web/app/auth/tags/index.tag
+ 1
− 1
View file @ c8c26bad
......@@ -3,7 +3,7 @@
<p class="fetching" if={ fetching }>読み込み中
<mk-ellipsis></mk-ellipsis>
</p>
<mk-form ref="form" if={ state == null &amp;&amp; !fetching } session={ session }></mk-form>
<mk-form ref="form" if={ state == null && !fetching } session={ session }></mk-form>
<div class="denied" if={ state == 'denied' }>
<h1>アプリケーションの連携をキャンセルしました。</h1>
<p>このアプリがあなたのアカウントにアクセスすることはありません。</p>
......
src/web/app/common/tags/signup.tag
+ 1
− 1
View file @ c8c26bad
......@@ -3,7 +3,7 @@
<label class="username">
<p class="caption"><i class="fa fa-at"></i>ユーザー名</p>
<input ref="username" type="text" pattern="^[a-zA-Z0-9-]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required="required" onkeyup={ onChangeUsername }/>
<p class="profile-page-url-preview" if={ refs.username.value != '' &amp;&amp; username-state != 'invalidFormat' &amp;&amp; username-state != 'minRange' &amp;&amp; username-state != 'maxRange' }>{ CONFIG.url + '/' + refs.username.value }</p>
<p class="profile-page-url-preview" if={ refs.username.value != '' && username-state != 'invalidFormat' && username-state != 'minRange' && username-state != 'maxRange' }>{ CONFIG.url + '/' + refs.username.value }</p>
<p class="info" if={ usernameState == 'wait' } style="color:#999"><i class="fa fa-fw fa-spinner fa-pulse"></i>確認しています...</p>
<p class="info" if={ usernameState == 'ok' } style="color:#3CB7B5"><i class="fa fa-fw fa-check"></i>利用できます</p>
<p class="info" if={ usernameState == 'unavailable' } style="color:#FF1161"><i class="fa fa-fw fa-exclamation-triangle"></i>既に利用されています</p>
......
src/web/app/common/tags/special-message.tag
+ 2
− 2
View file @ c8c26bad
<mk-special-message>
<p if={ m == 1 &amp;&amp; d == 1 }>Happy New Year! </p>
<p if={ m == 12 &amp;&amp; d == 25 }>Merry Christmas!</p>
<p if={ m == 1 && d == 1 }>Happy New Year! </p>
<p if={ m == 12 && d == 25 }>Merry Christmas!</p>
<style type="stylus">
:scope
display block
......
src/web/app/common/tags/uploader.tag
+ 2
− 2
View file @ c8c26bad
......@@ -5,9 +5,9 @@
<p class="name"><i class="fa fa-spinner fa-pulse"></i>{ name }</p>
<p class="status"><span class="initing" if={ progress == undefined }>待機中
<mk-ellipsis></mk-ellipsis></span><span class="kb" if={ progress != undefined }>{ String(Math.floor(progress.value / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }<i>KB</i> / { String(Math.floor(progress.max / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }<i>KB</i></span><span class="percentage" if={ progress != undefined }>{ Math.floor((progress.value / progress.max) * 100) }</span></p>
<progress if={ progress != undefined &amp;&amp; progress.value != progress.max } value={ progress.value } max={ progress.max }></progress>
<progress if={ progress != undefined && progress.value != progress.max } value={ progress.value } max={ progress.max }></progress>
<div class="progress initing" if={ progress == undefined }></div>
<div class="progress waiting" if={ progress != undefined &amp;&amp; progress.value == progress.max }></div>
<div class="progress waiting" if={ progress != undefined && progress.value == progress.max }></div>
</li>
</ol>
<style type="stylus">
......
src/web/app/desktop/tags/autocomplete-suggestion.tag
+ 1
− 1
View file @ c8c26bad
<mk-autocomplete-suggestion>
<ol class="users" ref="users" if={ users.length &gt; 0 }>
<li each={ users } onclick={ parent.onClick } onkeydown={ parent.onKeydown } tabindex="-1"><img class="avatar" src={ avatar_url + '?thumbnail&amp;size=32' } alt=""/><span class="name">{ name }</span><span class="username">@{ username }</span></li>
<li each={ users } onclick={ parent.onClick } onkeydown={ parent.onKeydown } tabindex="-1"><img class="avatar" src={ avatar_url + '?thumbnail&size=32' } alt=""/><span class="name">{ name }</span><span class="username">@{ username }</span></li>
</ol>
<style type="stylus">
:scope
......
src/web/app/desktop/tags/big-follow-button.tag
+ 1
− 1
View file @ c8c26bad
<mk-big-follow-button>
<button class={ wait: wait, follow: !user.is_following, unfollow: user.is_following } if={ !init } onclick={ onclick } disabled={ wait } title={ user.is_following ? 'フォロー解除' : 'フォローする' }><span if={ !wait &amp;&amp; user.is_following }><i class="fa fa-minus"></i>フォロー解除</span><span if={ !wait &amp;&amp; !user.is_following }><i class="fa fa-plus"></i>フォロー</span><i class="fa fa-spinner fa-pulse fa-fw" if={ wait }></i></button>
<button class={ wait: wait, follow: !user.is_following, unfollow: user.is_following } if={ !init } onclick={ onclick } disabled={ wait } title={ user.is_following ? 'フォロー解除' : 'フォローする' }><span if={ !wait && user.is_following }><i class="fa fa-minus"></i>フォロー解除</span><span if={ !wait && !user.is_following }><i class="fa fa-plus"></i>フォロー</span><i class="fa fa-spinner fa-pulse fa-fw" if={ wait }></i></button>
<div class="init" if={ init }><i class="fa fa-spinner fa-pulse fa-fw"></i></div>
<style type="stylus">
:scope
......
src/web/app/desktop/tags/crop-window.tag
+ 1
− 1
View file @ c8c26bad
<mk-crop-window>
<mk-window ref="window" is-modal={ true } width={ '800px' }><yield to="header"><i class="fa fa-crop"></i>{ parent.title }</yield>
<yield to="content">
<div class="body"><img ref="img" src={ parent.image.url + '?thumbnail&amp;quality=80' } alt=""/></div>
<div class="body"><img ref="img" src={ parent.image.url + '?thumbnail&quality=80' } alt=""/></div>
<div class="action">
<button class="skip" onclick={ parent.skip }>クロップをスキップ</button>
<button class="cancel" onclick={ parent.cancel }>キャンセル</button>
......
src/web/app/desktop/tags/drive/browser.tag
+ 3
− 3
View file @ c8c26bad
......@@ -23,10 +23,10 @@
</virtual>
<button if={ moreFiles }>もっと読み込む</button>
</div>
<div class="empty" if={ files.length == 0 &amp;&amp; folders.length == 0 &amp;&amp; !loading }>
<div class="empty" if={ files.length == 0 && folders.length == 0 && !loading }>
<p if={ draghover }>ドロップですか？いいですよ、ボクはカワイイですからね</p>
<p if={ !draghover &amp;&amp; folder == null }><strong>ドライブには何もありません。</strong><br/>右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。</p>
<p if={ !draghover &amp;&amp; folder != null }>このフォルダーは空です</p>
<p if={ !draghover && folder == null }><strong>ドライブには何もありません。</strong><br/>右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。</p>
<p if={ !draghover && folder != null }>このフォルダーは空です</p>
</div>
</div>
<div class="loading" if={ loading }>
......
src/web/app/desktop/tags/drive/file.tag
+ 1
− 1
View file @ c8c26bad
......@@ -8,7 +8,7 @@
<div class="label" if={ I.data.wallpaper == file.id }><img src="/_/resources/label.svg"/>
<p>壁紙</p>
</div>
<div class="thumbnail"><img src={ file.url + '?thumbnail&amp;size=128' } alt=""/></div>
<div class="thumbnail"><img src={ file.url + '?thumbnail&size=128' } alt=""/></div>
<p class="name"><span>{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }</span><span class="ext" if={ file.name.lastIndexOf('.') != -1 }>{ file.name.substr(file.name.lastIndexOf('.')) }</span></p>
<style type="stylus">
:scope
......
src/web/app/desktop/tags/follow-button.tag
+ 1
− 1
View file @ c8c26bad
<mk-follow-button>
<button class={ wait: wait, follow: !user.is_following, unfollow: user.is_following } if={ !init } onclick={ onclick } disabled={ wait } title={ user.is_following ? 'フォロー解除' : 'フォローする' }><i class="fa fa-minus" if={ !wait &amp;&amp; user.is_following }></i><i class="fa fa-plus" if={ !wait &amp;&amp; !user.is_following }></i><i class="fa fa-spinner fa-pulse fa-fw" if={ wait }></i></button>
<button class={ wait: wait, follow: !user.is_following, unfollow: user.is_following } if={ !init } onclick={ onclick } disabled={ wait } title={ user.is_following ? 'フォロー解除' : 'フォローする' }><i class="fa fa-minus" if={ !wait && user.is_following }></i><i class="fa fa-plus" if={ !wait && !user.is_following }></i><i class="fa fa-spinner fa-pulse fa-fw" if={ wait }></i></button>
<div class="init" if={ init }><i class="fa fa-spinner fa-pulse fa-fw"></i></div>
<style type="stylus">
:scope
......
src/web/app/desktop/tags/following-setuper.tag
+ 3
− 3
View file @ c8c26bad
<mk-following-setuper>
<p class="title">気になるユーザーをフォロー:</p>
<div class="users" if={ !loading &amp;&amp; users.length &gt; 0 }>
<div class="user" each={ users }><a class="avatar-anchor" href={ CONFIG.url + '/' + username }><img class="avatar" src={ avatar_url + '?thumbnail&amp;size=42' } alt="" data-user-preview={ id }/></a>
<div class="users" if={ !loading && users.length &gt; 0 }>
<div class="user" each={ users }><a class="avatar-anchor" href={ CONFIG.url + '/' + username }><img class="avatar" src={ avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ id }/></a>
<div class="body"><a class="name" href={ CONFIG.url + '/' + username } target="_blank" data-user-preview={ id }>{ name }</a>
<p class="username">@{ username }</p>
</div>
<mk-follow-button user={ this }></mk-follow-button>
</div>
</div>
<p class="empty" if={ !loading &amp;&amp; users.length == 0 }>おすすめのユーザーは見つかりませんでした。</p>
<p class="empty" if={ !loading && users.length == 0 }>おすすめのユーザーは見つかりませんでした。</p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます
<mk-ellipsis></mk-ellipsis>
</p><a class="refresh" onclick={ refresh }>もっと見る</a>
......
src/web/app/desktop/tags/home-widgets/photo-stream.tag
+ 3
− 3
View file @ c8c26bad
......@@ -3,12 +3,12 @@
<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます
<mk-ellipsis></mk-ellipsis>
</p>
<div class="stream" if={ !initializing &amp;&amp; images.length &gt; 0 }>
<div class="stream" if={ !initializing && images.length &gt; 0 }>
<virtual each={ image in images }>
<div class="img" style={ 'background-image: url(' + image.url + '?thumbnail&amp;size=256)' }></div>
<div class="img" style={ 'background-image: url(' + image.url + '?thumbnail&size=256)' }></div>
</virtual>
</div>
<p class="empty" if={ !initializing &amp;&amp; images.length == 0 }>写真はありません</p>
<p class="empty" if={ !initializing && images.length == 0 }>写真はありません</p>
<style type="stylus">
:scope
display block
......
src/web/app/desktop/tags/home-widgets/profile.tag
+ 1
− 1
View file @ c8c26bad
<mk-profile-home-widget>
<div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&amp;size=256)' : '' } onclick={ setBanner }></div><img class="avatar" src={ I.avatar_url + '?thumbnail&amp;size=64' } onclick={ setAvatar } alt="avatar" data-user-preview={ I.id }/><a class="name" href={ CONFIG.url + '/' + I.username }>{ I.name }</a>
<div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } onclick={ setBanner }></div><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } onclick={ setAvatar } alt="avatar" data-user-preview={ I.id }/><a class="name" href={ CONFIG.url + '/' + I.username }>{ I.name }</a>
<p class="username">@{ I.username }</p>
<style type="stylus">
:scope
......
src/web/app/desktop/tags/home-widgets/user-recommendation.tag
+ 2
− 2
View file @ c8c26bad
<mk-user-recommendation-home-widget>
<p class="title"><i class="fa fa-users"></i>おすすめユーザー</p>
<button onclick={ refresh } title="他を見る"><i class="fa fa-refresh"></i></button>
<div class="user" if={ !loading &amp;&amp; users.length != 0 } each={ _user in users }><a class="avatar-anchor" href={ CONFIG.url + '/' + _user.username }><img class="avatar" src={ _user.avatar_url + '?thumbnail&amp;size=42' } alt="" data-user-preview={ _user.id }/></a>
<div class="user" if={ !loading && users.length != 0 } each={ _user in users }><a class="avatar-anchor" href={ CONFIG.url + '/' + _user.username }><img class="avatar" src={ _user.avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ _user.id }/></a>
<div class="body"><a class="name" href={ CONFIG.url + '/' + _user.username } data-user-preview={ _user.id }>{ _user.name }</a>
<p class="username">@{ _user.username }</p>
</div>
<mk-follow-button user={ _user }></mk-follow-button>
</div>
<p class="empty" if={ !loading &amp;&amp; users.length == 0 }>いません！</p>
<p class="empty" if={ !loading && users.length == 0 }>いません！</p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます
<mk-ellipsis></mk-ellipsis>
</p>
......
src/web/app/desktop/tags/images-viewer.tag
+ 1
− 1
View file @ c8c26bad
<mk-images-viewer>
<div class="image" ref="view" onmousemove={ mousemove } style={ 'background-image: url(' + image.url + '?thumbnail' } onclick={ click }><img src={ image.url + '?thumbnail&amp;size=512' } alt={ image.name } title={ image.name }/></div>
<div class="image" ref="view" onmousemove={ mousemove } style={ 'background-image: url(' + image.url + '?thumbnail' } onclick={ click }><img src={ image.url + '?thumbnail&size=512' } alt={ image.name } title={ image.name }/></div>
<style type="stylus">
:scope
display block
......
src/web/app/desktop/tags/input-dialog.tag
+ 1
− 1
View file @ c8c26bad
......@@ -6,7 +6,7 @@
</div>
<div class="action">
<button class="cancel" onclick={ parent.cancel }>キャンセル</button>
<button class="ok" disabled={ !parent.allowEmpty &amp;&amp; refs.text.value.length == 0 } onclick={ parent.ok }>決定</button>
<button class="ok" disabled={ !parent.allowEmpty && refs.text.value.length == 0 } onclick={ parent.ok }>決定</button>
</div></yield>
</mk-window>
<style type="stylus">
......
src/web/app/desktop/tags/list-user.tag
+ 1
− 1
View file @ c8c26bad
<mk-list-user><a class="avatar-anchor" href={ CONFIG.url + '/' + user.username }><img class="avatar" src={ user.avatar_url + '?thumbnail&amp;size=64' } alt="avatar"/></a>
<mk-list-user><a class="avatar-anchor" href={ CONFIG.url + '/' + user.username }><img class="avatar" src={ user.avatar_url + '?thumbnail&size=64' } alt="avatar"/></a>
<div class="main">
<header>
<div class="left"><a class="name" href={ CONFIG.url + '/' + user.username }>{ user.name }</a><span class="username">@{ user.username }</span></div>
......
src/web/app/desktop/tags/messaging/index.tag
+ 2
− 2
View file @ c8c26bad
......@@ -6,14 +6,14 @@
</div>
<div class="result">
<ol class="users" if={ searchResult.length &gt; 0 }>
<li each={ user in searchResult }><a onclick={ user._click }><img class="avatar" src={ user.avatar_url + '?thumbnail&amp;size=32' } alt=""/><span class="name">{ user.name }</span><span class="username">@{ user.username }</span></a></li>
<li each={ user in searchResult }><a onclick={ user._click }><img class="avatar" src={ user.avatar_url + '?thumbnail&size=32' } alt=""/><span class="name">{ user.name }</span><span class="username">@{ user.username }</span></a></li>
</ol>
</div>
</div>
<div class="main">
<div class="history" if={ history.length &gt; 0 }>
<virtual each={ history }><a class="user" data-is-me={ is_me } data-is-read={ is_read } onclick={ _click }>
<div><img class="avatar" src={ (is_me ? recipient.avatar_url : user.avatar_url) + '?thumbnail&amp;size=64' } alt=""/>
<div><img class="avatar" src={ (is_me ? recipient.avatar_url : user.avatar_url) + '?thumbnail&size=64' } alt=""/>
<header><span class="name">{ is_me ? recipient.name : user.name }</span><span class="username">{ '@' + (is_me ? recipient.username : user.username ) }</span>
<mk-time time={ created_at }></mk-time>
</header>
......
src/web/app/desktop/tags/messaging/message.tag
+ 2
− 2
View file @ c8c26bad
<mk-messaging-message data-is-me={ message.is_me }><a class="avatar-anchor" href={ CONFIG.url + '/' + message.user.username } title={ message.user.username } target="_blank"><img class="avatar" src={ message.user.avatar_url + '?thumbnail&amp;size=64' } alt=""/></a>
<mk-messaging-message data-is-me={ message.is_me }><a class="avatar-anchor" href={ CONFIG.url + '/' + message.user.username } title={ message.user.username } target="_blank"><img class="avatar" src={ message.user.avatar_url + '?thumbnail&size=64' } alt=""/></a>
<div class="content-container">
<div class="balloon">
<p class="read" if={ message.is_me &amp;&amp; message.is_read }>既読</p>
<p class="read" if={ message.is_me && message.is_read }>既読</p>
<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/_/resources/desktop/messaging/delete.png" alt="Delete"/></button>
<div class="content" if={ !message.is_deleted }>
<div ref="text"></div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment