Skip to content

Commit

Permalink
Merge pull request #193 from OpenDevelopmentMekong/master
Browse files Browse the repository at this point in the history
Merging to prod for releasing v2.4.5
  • Loading branch information
Huyeng authored May 14, 2018
2 parents 506c4d1 + d5e217e commit 9d304fe
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 147 deletions.
43 changes: 38 additions & 5 deletions css/profile-pages.css
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ table.dataTable thead .sorting_desc_disabled {
margin-bottom: 0;
}

#profiles td ul {
display: none;
#profiles td.child li {
padding: 0;
}

#profiles tbody {
Expand Down Expand Up @@ -314,7 +314,10 @@ table.dataTable thead .sorting_desc_disabled {
background-color: #fff;
display: inline-flex !important;
}

#mobile-filter i.fa-filter {
vertical-align: text-top;
margin:0;
}
.filter-container #search_all, .mobile-filter-container #search_all{
width: 100%;
margin: 0 10px 0 0;
Expand All @@ -325,7 +328,32 @@ table.dataTable thead .sorting_desc_disabled {
top: 37px;
z-index: 99;
}

.filter-container .panel_related_profile{
padding: 0
}
.panel_related_profile span{
font-size: 14px;
vertical-align: top;
}
.fixed-filter-container .panel_related_profile{
padding: 0 auto;
display: block;
background: #eee;
margin-left: 10px;
}
.filter-container .related_profiles_toggle_icon{
display: none;
cursor: pointer;
}
.fixed-filter-container .related_profiles_toggle_icon{
float: right;
position: relative;
margin: 0 0 0 10px;
display: block;
}
.related_profiles_toggle_icon i.fa-toggle-on{
font-size: 25px
}
.fixed_datatable_tool_bar {
display: none;
float: right;
Expand Down Expand Up @@ -354,6 +382,11 @@ table.dataTable thead .sorting_desc_disabled {
margin-left: 5px;
}

.related_profiles{
max-height: 70px;
overflow-y: auto;
}

#filter_by_classification{
width: 100%;
display: inline-block;
Expand Down Expand Up @@ -787,5 +820,5 @@ table.no-bgcolor tr{
.single #post-content .selected_option_ha,
.single #post-content .selected_option_per{
border: none;
padding: 0;
padding: 0;
}
114 changes: 56 additions & 58 deletions i18n/wp-odm_profile_pages-km.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ODM WP Profile pages\n"
"POT-Creation-Date: 2017-07-27 23:53+0200\n"
"PO-Revision-Date: 2017-07-27 23:53+0200\n"
"POT-Creation-Date: 2018-05-14 08:39+0700\n"
"PO-Revision-Date: 2018-05-14 08:42+0700\n"
"Last-Translator: ChandaraKhun <[email protected]>\n"
"Language-Team: Khmer (http://www.transifex.com/open-development-mekong/wp-odm_profile_pages/"
"language/km/)\n"
Expand All @@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.8.7.1\n"
"X-Generator: Poedit 2.0.1\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-KeywordsList: _;_e;__;_n:1,2;_x:1,2c;_ex:1,2c\n"
"X-Poedit-SourceCharset: UTF-8\n"
Expand Down Expand Up @@ -103,55 +103,55 @@ msgstr ""
msgid "Choose template layout"
msgstr "ជ្រើសរើសគំនូសគំរូ"

#: post-types/profile-pages.php:152 post-types/profile-pages.php:278 post-types/profile-pages.php:420
#: post-types/profile-pages.php:155 post-types/profile-pages.php:281 post-types/profile-pages.php:427
msgid "ENGLISH"
msgstr "ភាសាអង់គ្លេស"

#: post-types/profile-pages.php:164
#: post-types/profile-pages.php:167
msgid "CSV Resource URL (English)"
msgstr "URL របស់ធនធានជាទម្រង់ CSV (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:169 post-types/profile-pages.php:196
#: post-types/profile-pages.php:172 post-types/profile-pages.php:199
msgid ""
"CSV Resource of dataset on CKAN. Eg. https://data.opendevelopmentmekong.net/dataset/economic-land-"
"concessions/resource/3b817bce-9823-493b-8429-e5233ba3bd87?type=dataset"
msgstr ""
"ធនធានទិន្នន័យជាទម្រង់ CSV នៅលើ CKAN ។ ឧទាហរណ៍ https://data.opendevelopmentmekong.net/dataset/economic-"
"land-concessions/resource/3b817bce-9823-493b-8429-e5233ba3bd87?type=dataset"

#: post-types/profile-pages.php:174
#: post-types/profile-pages.php:177
msgid "CSV Tracking URL (English)"
msgstr "URL ប្រែតាមទម្រង់ CSV (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:179 post-types/profile-pages.php:203
#: post-types/profile-pages.php:182 post-types/profile-pages.php:206
msgid ""
"CSV Resource of tracking dataset on CKAN. Eg. https://data.opendevelopmentmekong.net/dataset/"
"economic-land-concessions/resource/8cc0c651-8131-404e-bbce-7fe6af728f89?type=dataset"
msgstr ""
"ធនធានជាទម្រង់ CSV ប្រែតាមសំណុំទិន្នន័យលើ CKAN ។ ឧទាហរណ៍ https://data.opendevelopmentmekong.net/dataset/"
"economic-land-concessions/resource/8cc0c651-8131-404e-bbce-7fe6af728f89?type=dataset"

#: post-types/profile-pages.php:193
#: post-types/profile-pages.php:196
msgid "CSV Resource URL ("
msgstr "URL របស់ធនធានទម្រង់ CSV ("

#: post-types/profile-pages.php:200
#: post-types/profile-pages.php:203
msgid "CSV Tracking URL ("
msgstr "URL ប្រែតាមទម្រង់ CSV ("

#: post-types/profile-pages.php:242 post-types/profile-pages.php:248
#: post-types/profile-pages.php:245 post-types/profile-pages.php:251
msgid "The attributes of Resource Dataset that would like to display, separated by line breaks ("
msgstr "លក្ខណៈសម្បត្តិ សំណុំទិន្នន័យធនធាន ដែលនឹងបង្ហាញ ខណ្ឌចែកដោយការកាត់ផ្តាច់ដោយបន្ទាត់ ("

#: post-types/profile-pages.php:245 post-types/profile-pages.php:251
#: post-types/profile-pages.php:248 post-types/profile-pages.php:254
msgid "The attributes of Tracking Resource that would like to display, separated by line breaks ("
msgstr "លក្ខណៈសម្បត្តិធនធាន ដែលនឹងបង្ហាញ ខណ្ឌចែកដោយការកាត់ផ្តាច់ដោយបន្ទាត់ ("

#: post-types/profile-pages.php:290
#: post-types/profile-pages.php:293
msgid "Show Total Numbers of Columns, separated by line breaks (English)"
msgstr "បង្ហាញចំនួនបន្ទាត់បញ្ឈរសរុប ខណ្ឌចែកដោយការកាត់ផ្តាច់ដោយបន្ទាត់ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:293
#: post-types/profile-pages.php:296
msgid ""
"List the attribute names to show their total number on page (separated by line breaks). Eg. For "
"ELC: <br/>map_id<br/>developer<br/>data_class[\"Government data complete\", \"Government data "
Expand All @@ -161,11 +161,11 @@ msgstr ""
"សម្រាប់សម្បទានដីសេដ្ឋកិច្ច៖ <br/>ផែនទី_id<br/>អ្នកអភិវឌ្ឍ<br/>ទិន្នន័យ_ថ្នាក់[\"ទិន្នន័យរដ្ឋាភិបាលពេញលេញ\", "
"\"ទិន្នន័យរដ្ឋាភិបាលមិនពេញលេញ\"] "

#: post-types/profile-pages.php:297
#: post-types/profile-pages.php:300
msgid "Create Select Filter by Column Index (English)"
msgstr "បង្កើតប្រអប់ ជ្រើសរើសតាមវិស័យ ដោយ សន្ទស្សន៍បន្ទាត់បញ្ឈរ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:300 post-types/profile-pages.php:352
#: post-types/profile-pages.php:303 post-types/profile-pages.php:355
msgid ""
"Filter selectors will create automatically by adding the column index and separated by comma. "
"Maximum Filter selectors can create is three. Eg. Create filter selectors of Data Adjustment and "
Expand All @@ -175,22 +175,22 @@ msgstr ""
"ឧបករណ៍ជ្រើសវិស័យជាអតិបរមា អាចបង្កើតបាន គឺមានចំនួនបី។ ឧទាហរណ៍ បង្កើត ឧបករណ៍ជ្រើសវិស័យ សម្រាប់ ការផ្លាស់ប្តូរទិន្នន័យ និងដំណាំ "
"ឬគម្រោងគ្រោងទុក នៃសម្បទានដីសេដ្ឋកិច្ច ដែលមានសន្ទស្សន៍ ២ និង ៥"

#: post-types/profile-pages.php:304
#: post-types/profile-pages.php:307
msgid "Group Data in Column (English)"
msgstr "ដាក់ទិន្នន័យជាក្រុមលើបន្ទាត់បញ្ឈរ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:307 post-types/profile-pages.php:359
#: post-types/profile-pages.php:310 post-types/profile-pages.php:362
msgid ""
"Eg. To group data classification of ELC, based on the attributes sample provided, the index of "
"data classification is: 5"
msgstr ""
"ឧទាហរណ៍ ដើម្បីដាក់ចំណាត់ថ្នាក់សម្បទានដីសេដ្ឋកិច្ចជាក្រុម ដែលយោងទៅលើគំរូលក្ខណៈសម្បត្តិផ្តល់ឲ្យ សន្ទស្សន៍ចំណាត់ថ្នាក់ទិន្នន័យគឺ៖ ៥"

#: post-types/profile-pages.php:311
#: post-types/profile-pages.php:314
msgid "Related Profile Pages (English)"
msgstr "ទំព័រព័ត៌មានទិន្នន័យពាក់ព័ន្ធ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:314 post-types/profile-pages.php:366
#: post-types/profile-pages.php:317 post-types/profile-pages.php:369
msgid ""
"Please add the links of profile pages that related (separated by new breaking line). Format: Title "
"of Link|URL. <br/>eg. Economic Land Concessions|https://cambodia.opendevelopmentmekong.net/"
Expand All @@ -200,79 +200,79 @@ msgstr ""
">ឧទាហរណ៍ សម្បទានដីសេដ្ឋកិច្ច|https://cambodia.opendevelopmentmekong.net/profiles/economic-land-"
"concessions/"

#: post-types/profile-pages.php:318
#: post-types/profile-pages.php:321
msgid "Column ids linking to detail page (English)"
msgstr "Ids របស់បន្ទាត់បញ្ឈរ ដែលភ្ជាប់ទៅកាន់ទំព័រពិស្តារ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:321 post-types/profile-pages.php:373
#: post-types/profile-pages.php:324 post-types/profile-pages.php:376
msgid ""
"Please add the ids of the columns that will feature a link to the entry's detail page. Format: "
"Comma-separated values. <br/>eg. name,company,developer,block"
msgstr ""
"សូមបន្ថែម ids របស់បន្ទាត់បញ្ឈរ ដែលនឹងកំណត់លក្ខណៈ​ពិសេសឲ្យតំណទៅកាន់ច្រកចូលរបស់ទំព័រពិស្តារ។ ទម្រង់៖ តម្លៃខណ្ឌចែកដោយសញ្ញាក្បៀស។ "
"<br/>ឧទាហរណ៍ ឈ្មោះ,ក្រុមហ៊ុន,អ្នកអភិវឌ្ឍ,ប្លុក"

#: post-types/profile-pages.php:325
#: post-types/profile-pages.php:328
msgid "Select the column id to use for Detail Link (English)"
msgstr ""

#: post-types/profile-pages.php:331 post-types/profile-pages.php:383
#: post-types/profile-pages.php:334 post-types/profile-pages.php:386
msgid "Please select the ids of the columns that will use as link to detail page."
msgstr ""

#: post-types/profile-pages.php:342
#: post-types/profile-pages.php:345
msgid "Show Total Numbers of Columns, separated by line breaks ("
msgstr "បង្ហាញចំនួនបន្ទាត់បញ្ឈរសរុប ខណ្ឌចែកដោយការកាត់ផ្តាច់ដោយបន្ទាត់ ("

#: post-types/profile-pages.php:345
#: post-types/profile-pages.php:348
msgid ""
"List the attribut4 names to show their total number on page (separated by line breaks). Eg. For "
"ELC: map_id<br/>developer<br/>data_class[\"Government data complete\", \"Government data partial\"]"
msgstr ""
"រាយឈ្មោះលក្ខណៈសម្បត្តិ ដើម្បីបង្ហាញចំនួនសរុបពួកវាលើទំព័រ (ខណ្ឌចែកដោយការកាត់ផ្តាច់ដោយបន្ទាត់)។ ឧទាហរណ៍ សម្បទានដីសេដ្ឋកិច្ច៖ "
"ផែនទី_id<br/>អ្នកអភិវឌ្ឍ<br/>ទិន្នន័យ_ថ្នាក់[\"ទិន្នន័យរដ្ឋាភិបាលពេញលេញ\", \"ទិន្នន័យរដ្ឋាភិបាលមិនពេញលេញ\"]"

#: post-types/profile-pages.php:349
#: post-types/profile-pages.php:352
msgid "Create Select Filter by Column Index ("
msgstr "បង្កើតប្រអប់ ជ្រើសរើសតាមវិស័យ ដោយ សន្ទស្សន៍បន្ទាត់បញ្ឈរ ("

#: post-types/profile-pages.php:356
#: post-types/profile-pages.php:359
msgid "Group Data in Column ("
msgstr "ដាក់ទិន្នន័យជាក្រុមលើបន្ទាត់បញ្ឈរ ("

#: post-types/profile-pages.php:363
#: post-types/profile-pages.php:366
msgid "Related Profile Pages ("
msgstr "ទំព័រព័ត៌មានទិន្នន័យពាក់ព័ន្ធ ( "

#: post-types/profile-pages.php:370
#: post-types/profile-pages.php:373
msgid "Column ids linking to detail page ("
msgstr "Ids របស់បន្ទាត់ជួរឈរ ភ្ជាប់ទៅទំព័រលម្អិត ("

#: post-types/profile-pages.php:377
#: post-types/profile-pages.php:380
msgid "Select the column id to use for Detail Link ("
msgstr ""

#: post-types/profile-pages.php:435
msgid "Full width content (English)"
msgstr "ខ្លឹមសារផ្ទៃពេញ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:439
#: post-types/profile-pages.php:423
msgid "Show above the map"
msgstr ""

#: post-types/profile-pages.php:442 post-types/profile-pages.php:458
#: post-types/profile-pages.php:441
msgid "Full width content (English)"
msgstr "ខ្លឹមសារផ្ទៃពេញ (ភាសាអង់គ្លេស)"

#: post-types/profile-pages.php:445 post-types/profile-pages.php:462
msgid ""
"Any content can add to under the Editor content and sidebar and full width of website even the "
"iframe."
msgstr ""
"ខ្លឹមសារទាំងឡាយអាចបន្ថែមនៅក្រោមខ្លឹមសារអ្នក​ពិនិត្យ​ផ្ទៀង​ផ្ទាត់ ព្រមជាមួយរបា​ខាងនៃ​គេហទំព័រ និងផ្ទៃគេហទំព័រពេញទាំងមូល រួមទាំង "
"iframe ផងដែរ។"

#: post-types/profile-pages.php:454
msgid "Full width content ("
msgstr ""
#: post-types/profile-pages.php:458
msgid "Full width content (("
msgstr "ខ្លឹមសារផ្ទៃពេញ (("

#: post-types/profile-pages.php:494
#: post-types/profile-pages.php:498
msgid "Add sub navigation"
msgstr ""

Expand Down Expand Up @@ -305,47 +305,48 @@ msgid ": "
msgstr "៖"

#: post-types/templates/page-profiles-list-page.php:128
#: post-types/templates/page-profiles-list-page.php:195
#: post-types/templates/page-profiles-list-page.php:202
msgid "Search data in profile page"
msgstr "ស្វែងរកទិន្នន័យក្នុងទំព័រនេះ"

#: post-types/templates/page-profiles-list-page.php:143
#: post-types/templates/page-profiles-list-page.php:195
msgid "Filters"
msgstr ""
msgstr "ជ្រើសរើស"

#: post-types/templates/page-profiles-list-page.php:154
#: post-types/templates/page-profiles-list-page.php:175
#: post-types/templates/page-profiles-list-page.php:204
#: post-types/templates/page-profiles-list-page.php:225
#: post-types/templates/page-profiles-list-page.php:211
#: post-types/templates/page-profiles-list-page.php:233
msgid "Filter by"
msgstr "ជ្រើសរើសតាម"

#: post-types/templates/page-profiles-list-page.php:159
#: post-types/templates/page-profiles-list-page.php:209
#: post-types/templates/page-profiles-list-page.php:216
msgid "Related profiles"
msgstr "ព័ត៌មានទិន្នន័យពាក់ព័ន្ធ"

#: post-types/templates/page-profiles-list-page.php:194
#: post-types/templates/page-profiles-list-page.php:201
msgid "Textual search"
msgstr "ស្វែងរកក្នុងអត្ថបទ"

#: post-types/templates/page-profiles-list-page.php:247
#: post-types/templates/page-profiles-list-page.php:256
msgid "Map ID"
msgstr "លេខសម្គាស់"

#: post-types/templates/page-profiles-list-page.php:309
#: post-types/templates/page-profiles-list-page.php:320
#: post-types/templates/page-profiles-list-page.php:343
#: post-types/templates/page-profiles-list-page.php:351
#: post-types/templates/page-profiles-list-page.php:318
#: post-types/templates/page-profiles-list-page.php:329
#: post-types/templates/page-profiles-list-page.php:352
#: post-types/templates/page-profiles-list-page.php:360
#: post-types/templates/page-profiles-single-page.php:51 utils/utils.php:25
msgid "Unknown"
msgstr "មិនស្គាល់"

#: post-types/templates/page-profiles-list-page.php:578
#: post-types/templates/page-profiles-list-page.php:611
msgid "all"
msgstr "ទាំងអស់"

#: post-types/templates/page-profiles-list-page.php:584
#: post-types/templates/page-profiles-list-page.php:617
msgid "All "
msgstr "ទាំងអស់"

Expand Down Expand Up @@ -436,9 +437,6 @@ msgstr "សម្បទានទាំងនេះត្រូវបាន​ល
msgid "Metadata"
msgstr "ព័ត៌មានអំពីទិន្នន័យ"

#: utils/utils.php:278
#: utils/utils.php:281
msgid "Download and Metadata"
msgstr "ទាញយក និង ទិន្នន័យមេតា"

#~ msgid "Full width content (("
#~ msgstr "ខ្លឹមសារផ្ទៃពេញ (("
Loading

0 comments on commit 9d304fe

Please sign in to comment.