diff options
33 files changed, 101 insertions, 731 deletions
diff --git a/js/country.js b/js/country.js index b18a529d1..1c7505580 100755 --- a/js/country.js +++ b/js/country.js @@ -52,7 +52,7 @@ aStates[28]="|Central|Chobe|Francistown|Gaborone|Ghanzi|Kgalagadi|Kgatleng|Kwene aStates[29]="|Acre|Alagoas|Amapa|Amazonas|Bahia|Ceara|Distrito Federal|Espirito Santo|Goias|Maranhao|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Para|Paraiba|Parana|Pernambuco|Piaui|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondonia|Roraima|Santa Catarina|Sao Paulo|Sergipe|Tocantins";
aStates[30]="|Anegada|Jost Van Dyke|Tortola|Virgin Gorda";
aStates[31]="|Belait|Brunei and Muara|Temburong|Tutong";
-aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Khaskovo|Kurdzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Ruse|Shumen|Silistra|Sliven|Smolyan|Sofiya|Sofiya-Grad|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";
+aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Haskovo|Kardzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Rousse|Shumen|Silistra|Sliven|Smolyan|Sofia|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";
aStates[33]="|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komandjari|Kompienga|Kossi|Koupelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Naumbiel|Nayala|Oubritenga|Oudalan|Passore|Poni|Samentenga|Sanguie|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondomo|Zoundweogo";
aStates[34]="|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon";
aStates[35]="|Bubanza|Bujumbura|Bururi|Cankuzo|Cibitoke|Gitega|Karuzi|Kayanza|Kirundo|Makamba|Muramvya|Muyinga|Mwaro|Ngozi|Rutana|Ruyigi";
@@ -105,7 +105,7 @@ aStates[79]="|Estuaire|Haut-Ogooue|Moyen-Ogooue|Ngounie|Nyanga|Ogooue-Ivindo|Ogo aStates[80]="|Banjul|Central River|Lower River|North Bank|Upper River|Western";
aStates[81]="|Gaza Strip";
aStates[82]="|Abashis|Abkhazia or Ap'khazet'is Avtonomiuri Respublika (Sokhumi)|Adigenis|Ajaria or Acharis Avtonomiuri Respublika (Bat'umi)|Akhalgoris|Akhalk'alak'is|Akhalts'ikhis|Akhmetis|Ambrolauris|Aspindzis|Baghdat'is|Bolnisis|Borjomis|Ch'khorotsqus|Ch'okhatauris|Chiat'ura|Dedop'listsqaros|Dmanisis|Dushet'is|Gardabanis|Gori|Goris|Gurjaanis|Javis|K'arelis|K'ut'aisi|Kaspis|Kharagaulis|Khashuris|Khobis|Khonis|Lagodekhis|Lanch'khut'is|Lentekhis|Marneulis|Martvilis|Mestiis|Mts'khet'is|Ninotsmindis|Onis|Ozurget'is|P'ot'i|Qazbegis|Qvarlis|Rust'avi|Sach'kheris|Sagarejos|Samtrediis|Senakis|Sighnaghis|T'bilisi|T'elavis|T'erjolis|T'et'ritsqaros|T'ianet'is|Tqibuli|Ts'ageris|Tsalenjikhis|Tsalkis|Tsqaltubo|Vanis|Zestap'onis|Zugdidi|Zugdidis";
-aStates[83]="|Baden-Wuerttemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thueringen";
+aStates[83]="|Baden-Württemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thüringen";
aStates[84]="|Ashanti|Brong-Ahafo|Central|Eastern|Greater Accra|Northern|Upper East|Upper West|Volta|Western";
aStates[85]="|Gibraltar";
aStates[86]="|Ile du Lys|Ile Glorieuse";
@@ -131,8 +131,8 @@ aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assa aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";
aStates[107]="|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan";
aStates[108]="|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit";
-aStates[109]="|Carlow|Cavan|Clare|Cork|Donegal|Dublin|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Waterford|Westmeath|Wexford|Wicklow";
-aStates[110]="|Antrim|Ards|Armagh|Ballymena|Ballymoney|Banbridge|Belfast|Carrickfergus|Castlereagh|Coleraine|Cookstown|Craigavon|Derry|Down|Dungannon|Fermanagh|Larne|Limavady|Lisburn|Magherafelt|Moyle|Newry and Mourne|Newtownabbey|North Down|Omagh|Strabane";
+aStates[109]="|Antrim|Armargh|Carlow|Cavan|Clare|Cork|Derry|Donegal|Down|Dún Laoghaire–Rathdown|Fermanagh|Dublin|Fingal|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Tyrone|Waterford|Westmeath|Wexford|Wicklow";
+aStates[110]="|Antrim|Armagh|Belfast|Down|Fermanagh|Londonderry|Tyrone";
aStates[111]="|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv";
aStates[112]="|Abruzzi|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto";
aStates[113]="|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland";
@@ -222,7 +222,7 @@ aStates[196]="|A'ana|Aiga-i-le-Tai|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|P aStates[197]="|Acquaviva|Borgo Maggiore|Chiesanuova|Domagnano|Faetano|Fiorentino|Monte Giardino|San Marino|Serravalle";
aStates[198]="|Principe|Sao Tome";
aStates[199]="|'Asir|Al Bahah|Al Hudud ash Shamaliyah|Al Jawf|Al Madinah|Al Qasim|Ar Riyad|Ash Sharqiyah (Eastern Province)|Ha'il|Jizan|Makkah|Najran|Tabuk";
-aStates[200]="|Aberdeen City|Aberdeenshire|Angus|Argyll and Bute|City of Edinburgh|Clackmannanshire|Dumfries and Galloway|Dundee City|East Ayrshire|East Dunbartonshire|East Lothian|East Renfrewshire|Eilean Siar (Western Isles)|Falkirk|Fife|Glasgow City|Highland|Inverclyde|Midlothian|Moray|North Ayrshire|North Lanarkshire|Orkney Islands|Perth and Kinross|Renfrewshire|Shetland Islands|South Ayrshire|South Lanarkshire|Stirling|The Scottish Borders|West Dunbartonshire|West Lothian";
+aStates[200]="|Aberdeenshire|Angus|Argyll|Ayrshire|Banffshire|Berwickshire|Bute|Caithness|Clackmannanshire|Cromartyshire|Dumfriesshire|Dunbartonshire|Dundee City|East Lothian|Edinburgh|Fife|Glasgow City|Inverness-shire|Kincardineshire|Kinross-shire|Kirkcudbrightshire|Lanarkshire|Midlothian|Moray|Nairnshire|Orkney Islands|Peeblesshire|Perthshire|Renfrewshire|Ross and Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland Islands|Stirlingshire|Sutherland|West Lothian|Wigtownshire";
aStates[201]="|Dakar|Diourbel|Fatick|Kaolack|Kolda|Louga|Saint-Louis|Tambacounda|Thies|Ziguinchor";
aStates[202]="|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Louis|Anse Royale|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|Glacis|Grand' Anse (on Mahe)|Grand' Anse (on Praslin)|La Digue|La Riviere Anglaise|Mont Buxton|Mont Fleuri|Plaisance|Pointe La Rue|Port Glaud|Saint Louis|Takamaka";
aStates[203]="|Eastern|Northern|Southern|Western";
@@ -233,7 +233,7 @@ aStates[207]="|Bellona|Central|Choiseul (Lauru)|Guadalcanal|Honiara|Isabel|Makir aStates[208]="|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed";
aStates[209]="|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Mpumalanga|North-West|Northern Cape|Northern Province|Western Cape";
aStates[210]="|Bird Island|Bristol Island|Clerke Rocks|Montagu Island|Saunders Island|South Georgia|Southern Thule|Traversay Islands";
-aStates[211]="|Andalucia|Aragon|Asturias|Baleares (Balearic Islands)|Canarias (Canary Islands)|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Ceuta|Communidad Valencian|Extremadura|Galicia|Islas Chafarinas|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco (Basque Country)|Penon de Alhucemas|Penon de Velez de la Gomera";
+aStates[211]="|Andalucia|Aragon|Asturias|Ceuta|Islas Baleares|Islas Chafarinas|Islas Canarias|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Extremadura|Galicia|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco|Peñón de Alhucemas|Peñón de Vélez de la Gomera|Valencia";
aStates[212]="|Spratly Islands";
aStates[213]="|Central|Eastern|North Central|North Eastern|North Western|Northern|Sabaragamuwa|Southern|Uva|Western";
aStates[214]="|A'ali an Nil|Al Bahr al Ahmar|Al Buhayrat|Al Jazirah|Al Khartum|Al Qadarif|Al Wahdah|An Nil al Abyad|An Nil al Azraq|Ash Shamaliyah|Bahr al Jabal|Gharb al Istiwa'iyah|Gharb Bahr al Ghazal|Gharb Darfur|Gharb Kurdufan|Janub Darfur|Janub Kurdufan|Junqali|Kassala|Nahr an Nil|Shamal Bahr al Ghazal|Shamal Darfur|Shamal Kurdufan|Sharq al Istiwa'iyah|Sinnar|Warab";
@@ -259,7 +259,7 @@ aStates[233]="|Tuvalu"; aStates[234]="|Adjumani|Apac|Arua|Bugiri|Bundibugyo|Bushenyi|Busia|Gulu|Hoima|Iganga|Jinja|Kabale|Kabarole|Kalangala|Kampala|Kamuli|Kapchorwa|Kasese|Katakwi|Kibale|Kiboga|Kisoro|Kitgum|Kotido|Kumi|Lira|Luwero|Masaka|Masindi|Mbale|Mbarara|Moroto|Moyo|Mpigi|Mubende|Mukono|Nakasongola|Nebbi|Ntungamo|Pallisa|Rakai|Rukungiri|Sembabule|Soroti|Tororo";
aStates[235]="|Avtonomna Respublika Krym (Simferopol')|Cherkas'ka (Cherkasy)|Chernihivs'ka (Chernihiv)|Chernivets'ka (Chernivtsi)|Dnipropetrovs'ka (Dnipropetrovs'k)|Donets'ka (Donets'k)|Ivano-Frankivs'ka (Ivano-Frankivs'k)|Kharkivs'ka (Kharkiv)|Khersons'ka (Kherson)|Khmel'nyts'ka (Khmel'nyts'kyy)|Kirovohrads'ka (Kirovohrad)|Kyyiv|Kyyivs'ka (Kiev)|L'vivs'ka (L'viv)|Luhans'ka (Luhans'k)|Mykolayivs'ka (Mykolayiv)|Odes'ka (Odesa)|Poltavs'ka (Poltava)|Rivnens'ka (Rivne)|Sevastopol'|Sums'ka (Sumy)|Ternopil's'ka (Ternopil')|Vinnyts'ka (Vinnytsya)|Volyns'ka (Luts'k)|Zakarpats'ka (Uzhhorod)|Zaporiz'ka (Zaporizhzhya)|Zhytomyrs'ka (Zhytomyr)"
aStates[236]="|'Ajman|Abu Zaby (Abu Dhabi)|Al Fujayrah|Ash Shariqah (Sharjah)|Dubayy (Dubai)|Ra's al Khaymah|Umm al Qaywayn";
-aStates[237]="|Barking and Dagenham|Barnet|Barnsley|Bath and North East Somerset|Bedfordshire|Bexley|Birmingham|Blackburn with Darwen|Blackpool|Bolton|Bournemouth|Bracknell Forest|Bradford|Brent|Brighton and Hove|Bromley|Buckinghamshire|Bury|Calderdale|Cambridgeshire|Camden|Cheshire|City of Bristol|City of Kingston upon Hull|City of London|Cornwall|Coventry|Croydon|Cumbria|Darlington|Derby|Derbyshire|Devon|Doncaster|Dorset|Dudley|Durham|Ealing|East Riding of Yorkshire|East Sussex|Enfield|Essex|Gateshead|Gloucestershire|Greenwich|Hackney|Halton|Hammersmith and Fulham|Hampshire|Haringey|Harrow|Hartlepool|Havering|Herefordshire|Hertfordshire|Hillingdon|Hounslow|Isle of Wight|Islington|Kensington and Chelsea|Kent|Kingston upon Thames|Kirklees|Knowsley|Lambeth|Lancashire|Leeds|Leicester|Leicestershire|Lewisham|Lincolnshire|Liverpool|Luton|Manchester|Medway|Merton|Middlesbrough|Milton Keynes|Newcastle upon Tyne|Newham|Norfolk|North East Lincolnshire|North Lincolnshire|North Somerset|North Tyneside|North Yorkshire|Northamptonshire|Northumberland|Nottingham|Nottinghamshire|Oldham|Oxfordshire|Peterborough|Plymouth|Poole|Portsmouth|Reading|Redbridge|Redcar and Cleveland|Richmond upon Thames|Rochdale|Rotherham|Rutland|Salford|Sandwell|Sefton|Sheffield|Shropshire|Slough|Solihull|Somerset|South Gloucestershire|South Tyneside|Southampton|Southend-on-Sea|Southwark|St. Helens|Staffordshire|Stockport|Stockton-on-Tees|Stoke-on-Trent|Suffolk|Sunderland|Surrey|Sutton|Swindon|Tameside|Telford and Wrekin|Thurrock|Torbay|Tower Hamlets|Trafford|Wakefield|Walsall|Waltham Forest|Wandsworth|Warrington|Warwickshire|West Berkshire|West Sussex|Westminster|Wigan|Wiltshire|Windsor and Maidenhead|Wirral|Wokingham|Wolverhampton|Worcestershire|York";
+aStates[237]="|Aberdeen|Aberdeenshire|Anglesey|Angus|Antrim|Argyl|Armagh|Avon|Ayrshire|Banffshire|Bedfordshire|Belfast|Berwickshire|Brecknockshire|Bristol|Buckinghamshire|Bute|Caernarfonshire|Cardiganshire|Caithness|Cambridgeshire|Carmarthenshire|Chesire|Clackmannashire|Cleveland|Clwyd|Cornwall|Cromartyshire|Cumberland|Cumbria|Denbighshire|Derbyshire|Devon|Dfyed|Dorset|Down|Dumfriesshire|Dunbartonshire|Dundee|Durham|East Lothian|East Suffolk|Derry|East Sussex|Edinburgh|Essex|Fermanagh|Fife|Flintshire|Glasgow|Glamorgan|Gloucestershire|Greater London|Greater Manchester|Gwent|Gwynedd|Hampshire|Hereford and Worcester|Herefordshire|Inverness-shire|Hertfordshire|Humberside|Huntingdon and Peterborough|Huntingdonshire|Isle of Ely|Isle of Wight|Kent|Kincardineshire|Kincross-shire|Kirkcudbrightshire|Lanarkshire|Lancashire|Leicestershire|Lincolnshire|London|Londonderry|Merionethshire|Merseyside|Middlesex|Mid Glamorgan|Midlothian|Monmouthshire|Montgomeryshire|Moray|Nairnshire|Norfolk|Northamptonshire|Northumberland|North Humberside|North Yorkshire|Nottinghamshire|Orkney|Oxfordshire|Peeblesshire|Pembrokeshire|Perthshire|Powys|Radnorshire|Renfrewshire|Ross And Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland|Stirlingshire|Sutherland|Soke of Peterborough|Rutland|Shropshire|Somerset|South Glamorgan|South Humberside|South Yorkshire|Staffordshite|Suffolk|Surrey|Sussex|Tyne and Wear|Tyrone|Warwickshire|West Glamorgan|West Lothian|West Midlands|Westmorland|West Suffolk|West Sussex|West Yorkshire|Wigtownshire|Wiltshire|Worcestershire|Yorkshire";
aStates[238]="|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres";
aStates[239]="|Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|District of Columbia|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New Hampshire|New Jersey|New Mexico|New York|North Carolina|North Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Rhode Island|South Carolina|South Dakota|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West Virginia|Wisconsin|Wyoming";
aStates[240]="|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati";
@@ -267,7 +267,7 @@ aStates[241]="|Malampa|Penama|Sanma|Shefa|Tafea|Torba"; aStates[242]="|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia";
aStates[243]="|An Giang|Ba Ria-Vung Tau|Bac Giang|Bac Kan|Bac Lieu|Bac Ninh|Ben Tre|Binh Dinh|Binh Duong|Binh Phuoc|Binh Thuan|Ca Mau|Can Tho|Cao Bang|Da Nang|Dac Lak|Dong Nai|Dong Thap|Gia Lai|Ha Giang|Ha Nam|Ha Noi|Ha Tay|Ha Tinh|Hai Duong|Hai Phong|Ho Chi Minh|Hoa Binh|Hung Yen|Khanh Hoa|Kien Giang|Kon Tum|Lai Chau|Lam Dong|Lang Son|Lao Cai|Long An|Nam Dinh|Nghe An|Ninh Binh|Ninh Thuan|Phu Tho|Phu Yen|Quang Binh|Quang Nam|Quang Ngai|Quang Ninh|Quang Tri|Soc Trang|Son La|Tay Ninh|Thai Binh|Thai Nguyen|Thanh Hoa|Thua Thien-Hue|Tien Giang|Tra Vinh|Tuyen Quang|Vinh Long|Vinh Phuc|Yen Bai";
aStates[244]="|Saint Croix|Saint John|Saint Thomas";
-aStates[245]="|Blaenau Gwent|Bridgend|Caerphilly|Cardiff|Carmarthenshire|Ceredigion|Conwy|Denbighshire|Flintshire|Gwynedd|Isle of Anglesey|Merthyr Tydfil|Monmouthshire|Neath Port Talbot|Newport|Pembrokeshire|Powys|Rhondda Cynon Taff|Swansea|The Vale of Glamorgan|Torfaen|Wrexham";
+aStates[245]="|Anglesey|Brecknockshire|Caernfonshire|Cardiganshire|Carmarthenshire|Clwyd|Denbighshire|Dyfed|Flintshire|Glamorgan|Gwent|Gwynedd|Merionethshire|Mid Glamorgan|Monmouthsire|Montgomeryshire|Pembrokeshire|Powys|Radnorshire|South Glamorgan|West Glamorgan";
aStates[246]="|Alo|Sigave|Wallis";
aStates[247]="|West Bank";
aStates[248]="|Western Sahara";
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index f1714a436..854684a5f 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -1,3 +1,7 @@ +{{ if $page }} +<div>$page</div> +{{ endif }} + {{ if $lastusers_title }} <h3 style="margin-top:0px;">Help or @NewHere ?</h3> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> @@ -21,6 +25,19 @@ {{ endif }} {{ if $lastusers_title }} +<h3>Find Friends</h3> +<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> +<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a> +<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a> +{{ endif }} + +{{ if $lastusers_title }} +<h3>PostIt to Friendica</h3> +<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div> +{{ endif }} + +{{ if $lastusers_title }} <h3>$lastusers_title</h3> <div id='lastusers-wrapper' class='items-wrapper'> {{ for $lastusers_items as $i }} @@ -47,14 +64,6 @@ </div> {{ endif }} -{{ if $page }} -<div>$page</div> -{{ endif }} - -{{ if $lastusers_title }} -<h3>PostIt to Friendica</h3> -<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div> -{{ endif }} {{ if $like_title }} <h3>$like_title</h3> diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png Binary files differnew file mode 100644 index 000000000..acf857f32 --- /dev/null +++ b/view/theme/diabook-blue/icons/pscontacts.png diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png Binary files differindex acf857f32..6d9539610 100644 --- a/view/theme/diabook-blue/icons/pubgroups.png +++ b/view/theme/diabook-blue/icons/pubgroups.png diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 289581c36..651b9647d 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -85,11 +85,7 @@ </li> - {{ if $nav.directory }} - <li id="nav-directory-link" class="nav-menu $sel.directory"> - <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> - </li> - {{ endif }} + {{ if $nav.apps }} <li id="nav-apps-link" class="nav-menu $sel.apps"> diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 902c2a0ed..511fc73ac 100755 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl @@ -12,7 +12,7 @@ <div id="photo-photo"> {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} - <a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a> + <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a> {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} </div> diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl index 0fa8a27fd..94396300f 100644 --- a/view/theme/diabook-blue/profile_side.tpl +++ b/view/theme/diabook-blue/profile_side.tpl @@ -9,6 +9,7 @@ <ul id="profile-side-menu" class="menu-profile-side"> <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> + <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 85cf23da1..c35320fcf 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -384,11 +384,10 @@ .hide-comments-outer { margin-left: 80px; - margin-bottom: 5px; + margin-bottom: 1px; width: 484px; border-bottom: 1px solid #BDCDD4; - border-top: 1px solid #BDCDD4; - + background-color: #E4EEF7; padding: 8px; } @@ -936,7 +935,9 @@ ul.menu-popup .empty { .menu-profile-list.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; } - +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; + } /* aside */ aside { display: table-cell; @@ -1189,7 +1190,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; } right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 30px;} +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} /* wall item */ .tread-wrapper { @@ -1271,7 +1272,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: } .wall-item-container .wall-item-content img { - max-width: 500px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; @@ -1323,11 +1324,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: float: right; } .wall-item-container.comment { - margin-top: 5px; - margin-bottom: 5px; + margin-top: 0px; + margin-bottom: 0px; margin-left: 80px; width: 500px; border-bottom: 1px solid hsl(198, 21%, 79%); + background-color: #E4EEF7; } .wall-item-container.comment .contact-photo { width: 32px; @@ -1343,20 +1345,31 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: .wall-item-container.comment .wall-item-links { padding-left: 12px; } +.wall-item-like { + background-color: #E4EEF7; + + } +.wall-item-dislike{ + background-color: #E4EEF7; + border-bottom: 1px solid #BECED5; + } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 0px 0px 80px; + background-color: #E4EEF7; + width: 500px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 100%; + width: 93%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; + margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 3671d963e..1296f1647 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1189,7 +1189,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; } right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 30px;} +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} /* wall item */ .tread-wrapper { @@ -1271,7 +1271,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: } .wall-item-container .wall-item-content img { - max-width: 500px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index a05a49e67..65a019dbf 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -178,8 +178,8 @@ .icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} +.icon.prev { background-image: url("../../../view/theme/diabook-blue/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook-blue/icons/next.png"); background-repeat: no-repeat;} /*.tagged { background-position: -130px -60px;}*/ .attachtype { @@ -387,8 +387,6 @@ margin-bottom: 5px; width: 684px; border-bottom: 1px solid #BDCDD4; - border-top: 1px solid #BDCDD4; - padding: 8px; } @@ -935,6 +933,9 @@ ul.menu-popup .empty { .menu-profile-list.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; } +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; + } /* aside */ aside { display: table-cell; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index a5f4490ba..bbda4f103 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -7,9 +7,6 @@ * Author: */ -$a->theme_info = array( - 'extends' => 'diabook', -); //change css on network and profilepages $cssFile = null; @@ -138,6 +135,16 @@ function diabook_blue_community_info(){ else {a_funct()}})()" ; $aside['$fostitJS'] = $fostitJS; + + //nav FIND FRIENDS + + $nv = array(); + $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['match'] = Array('match', t('Similar Interests'), "", ""); + $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); + $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); + + $aside['$nv'] = $nv; //Community Page $page = '<div id="page-sidebar-right_aside" class="widget"> @@ -199,6 +206,7 @@ if ($a->argv[0] === "network" && local_user()){ $ps = array('usermenu'=>array()); $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl index 20d24702b..123834064 100644 --- a/view/theme/diabook-blue/wall_item.tpl +++ b/view/theme/diabook-blue/wall_item.tpl @@ -1,6 +1,5 @@ {{ if $item.indent }}{{ else }} <div class="wall-item-decor"> - {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl index e02e5a8be..c5b6b36b5 100644 --- a/view/theme/diabook-blue/wallwall_item.tpl +++ b/view/theme/diabook-blue/wallwall_item.tpl @@ -1,6 +1,5 @@ {{ if $item.indent }}{{ else }} <div class="wall-item-decor"> - {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 23c26c910..aa150b9d0 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -1,3 +1,7 @@ +{{ if $page }} +<div>$page</div> +{{ endif }} + {{ if $lastusers_title }} <h3 style="margin-top:0px;">Help or @NewHere ?</h3> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> @@ -21,6 +25,11 @@ {{ endif }} {{ if $lastusers_title }} +<h3>PostIt to Friendica</h3> +<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div> +{{ endif }} + +{{ if $lastusers_title }} <h3>$lastusers_title</h3> <div id='lastusers-wrapper' class='items-wrapper'> {{ for $lastusers_items as $i }} @@ -47,15 +56,6 @@ </div> {{ endif }} -{{ if $page }} -<div>$page</div> -{{ endif }} - -{{ if $lastusers_title }} -<h3>PostIt to Friendica</h3> -<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div> -{{ endif }} - {{ if $like_title }} <h3>$like_title</h3> <ul id='likes'> diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index ba43c78c2..3854adc34 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1168,7 +1168,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; } right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 30px;} +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} .icon.expand { background-image: url("../../../view/theme/diabook/icons/expand.png"); @@ -1252,7 +1252,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: } .wall-item-container .wall-item-content img { - max-width: 500px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index da1a7dd6d..0f05bf6c1 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1166,7 +1166,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; } right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 30px;} +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} /* wall item */ .tread-wrapper { @@ -1244,7 +1244,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: } .wall-item-container .wall-item-content img { - max-width: 500px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 8064fb7e7..798eef422 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -7,9 +7,6 @@ * Author: */ -$a->theme_info = array( - //'extends' => 'diabook', //it's diabook, don't need to extend himself... -); //change css on network and profilepages $cssFile = null; diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index e47eb22ed..5dba6b94c 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -500,7 +500,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 0; } #search-text { - border: 1px #2e2f2e solid; + border: 1px #eec solid; background: #2e2f2e; color: #eec; } @@ -713,7 +713,7 @@ aside #viewcontacts { width: 150px; } #netsearch-box #search-submit { - margin: 5px 0px 0px 0px; + margin: 5px 5px 0px 0px; } .ttright { margin: 0px 0px 0px 0px; @@ -1046,6 +1046,9 @@ section { .shiny { background: #2e3436; } +.wall-outside-wrapper .shiny { + border-radius: 5px; +} .heart { color: red; } diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 7c80c8b5b..c591152c2 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -217,7 +217,7 @@ input[type=submit] { * nav */ nav { - height: 60px; + height: 80px; display: block; background-color: #2e3436; color: #eeeeec; @@ -497,8 +497,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } #search-text { border: 1px #eec solid; - background: #eec; - color: #e2e33436; + background: #2e3436; + color: #eec; } .nav-ajax-update, .nav-ajax-left { width: 30px; diff --git a/view/theme/quattro-green/comment_item.tpl b/view/theme/quattro-green/comment_item.tpl deleted file mode 100755 index cde4ca3ca..000000000 --- a/view/theme/quattro-green/comment_item.tpl +++ /dev/null @@ -1,32 +0,0 @@ - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> - <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> - <input type="hidden" name="type" value="$type" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="parent" value="$parent" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="jsreload" value="$jsreload" /> - <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-$id" > - <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> - </div> - <div class="comment-edit-photo-end"></div> - {{ if $qcomment }} - {{ for $qcomment as $qc }} - <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span> - - {{ endfor }} - {{ endif }} - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > - <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> - <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> - <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> - </div> - - <div class="comment-edit-end"></div> - </form> - - </div> diff --git a/view/theme/quattro-green/contact_template.tpl b/view/theme/quattro-green/contact_template.tpl deleted file mode 100755 index b826acc65..000000000 --- a/view/theme/quattro-green/contact_template.tpl +++ /dev/null @@ -1,26 +0,0 @@ - -<div class="contact-wrapper" id="contact-entry-wrapper-$id" > - <div class="contact-photo-wrapper" > - <div class="contact-photo mframe" id="contact-entry-photo-$contact.id" - onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" - onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" > - - <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a> - - {{ if $contact.photo_menu }} - <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a> - <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id"> - $contact.photo_menu - </ul> - {{ endif }} - </div> - - </div> - <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div> - {{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }} - <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div> - <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div> - - -</div> - diff --git a/view/theme/quattro-green/conversation.tpl b/view/theme/quattro-green/conversation.tpl deleted file mode 100755 index ff202bbe4..000000000 --- a/view/theme/quattro-green/conversation.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{{ for $threads as $thread }} -<div id="tread-wrapper-$thread.id" class="tread-wrapper"> - {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} - <div class="hide-comments-outer"> - <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span> - </div> - <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;"> - {{endif}} - {{if $item.comment_lastcollapsed}}</div>{{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -</div> -{{ endfor }} - -{{ if $dropping }} -<a href="#" onclick="deleteCheckedItems();return false;"> - <span class="icon s22 delete text">$dropping</span> -</a> -{{ endif }} diff --git a/view/theme/quattro-green/group_side.tpl b/view/theme/quattro-green/group_side.tpl deleted file mode 100755 index 596a8d13f..000000000 --- a/view/theme/quattro-green/group_side.tpl +++ /dev/null @@ -1,29 +0,0 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a> - </div> - - <div id="sidebar-group-list"> - <ul> - {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> - $group.text - </a> - {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a> - {{ endif }} - {{ if $group.cid }} - <input type="checkbox" - class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" - onclick="contactgroupChangeMember('$group.id','$group.cid');return true;" - {{ if $group.ismember }}checked="checked"{{ endif }} - /> - {{ endif }} - </li> - {{ endfor }} - </ul> - </div> -</div> - diff --git a/view/theme/quattro-green/jot.tpl b/view/theme/quattro-green/jot.tpl deleted file mode 100755 index 2f89d4372..000000000 --- a/view/theme/quattro-green/jot.tpl +++ /dev/null @@ -1,48 +0,0 @@ -<form id="profile-jot-form" action="$action" method="post"> - <div id="jot"> - <div id="profile-jot-desc" class="jothidden"> </div> - <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /> - <div id="character-counter" class="grey jothidden"></div> - - <input type="hidden" name="type" value="$ptyp" /> - <input type="hidden" name="profile_uid" value="$profile_uid" /> - <input type="hidden" name="return" value="$return_path" /> - <input type="hidden" name="location" id="jot-location" value="$defloc" /> - <input type="hidden" name="coord" id="jot-coord" value="" /> - <input type="hidden" name="post_id" value="$post_id" /> - <input type="hidden" name="preview" id="jot-preview" value="0" /> - - <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - - <ul id="jot-tools" class="jothidden" style="display:none"> - <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li> - <li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li> - <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li> - <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li> - <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li> - <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li> - <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li> - <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li> - $jotplugins - - <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang" title="$permset" ></a></li> - <li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li> - <li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></li> - </ul> - </div> - - <div id="jot-preview-content" style="display:none;"></div> - - <div style="display: none;"> - <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> - $acl - <hr style="clear:both"/> - <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> - <div id="profile-jot-email-end"></div> - $jotnets - </div> - </div> - -</form> - -{{ if $content }}<script>initEditor();</script>{{ endif }} diff --git a/view/theme/quattro-green/nav.tpl b/view/theme/quattro-green/nav.tpl deleted file mode 100755 index 8c872864c..000000000 --- a/view/theme/quattro-green/nav.tpl +++ /dev/null @@ -1,131 +0,0 @@ -<header> - {# $langselector #} - - <div id="site-location">$sitelocation</div> - <div id="banner">$banner</div> -</header> -<nav> - <ul> - {{ if $userinfo }} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a> - <ul id="nav-user-menu" class="menu-popup"> - {{ for $nav.usermenu as $usermenu }} - <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> - {{ endfor }} - - {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} - {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} - {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} - </ul> - </li> - {{ endif }} - - {{ if $nav.community }} - <li id="nav-community-link" class="nav-menu $sel.community"> - <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a> - </li> - {{ endif }} - - {{ if $nav.network }} - <li id="nav-network-link" class="nav-menu $sel.network"> - <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a> - <span id="net-update" class="nav-notify"></span> - </li> - {{ endif }} - {{ if $nav.home }} - <li id="nav-home-link" class="nav-menu $sel.home"> - <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a> - <span id="home-update" class="nav-notify"></span> - </li> - {{ endif }} - - {{ if $nav.notifications }} - <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> - <span id="notify-update" class="nav-notify"></span> - <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> - <li class="empty">$emptynotifications</li> - </ul> - </li> - {{ endif }} - - <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> - <ul id="nav-site-menu" class="menu-popup"> - {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} - - {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} - {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} - - {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} - {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} - </ul> - </li> - - {{ if $nav.help }} - <li id="nav-help-link" class="nav-menu $sel.help"> - <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> - </li> - {{ endif }} - - <li id="nav-search-link" class="nav-menu $sel.search"> - <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a> - </li> - <li id="nav-directory-link" class="nav-menu $sel.directory"> - <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> - </li> - - {{ if $nav.apps }} - <li id="nav-apps-link" class="nav-menu $sel.apps"> - <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a> - <ul id="nav-apps-menu" class="menu-popup"> - {{ for $apps as $ap }} - <li>$ap</li> - {{ endfor }} - </ul> - </li> - {{ endif }} - </ul> - -</nav> -<ul id="nav-notifications-template" style="display:none;" rel="template"> - <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> -</ul> - -{# - -{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }} -{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }} - -<span id="nav-link-wrapper" > - -{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }} - -<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> - -{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }} - -<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a> -<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> - -{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }} - -{{ if $nav.notifications }} -<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a> -<span id="notify-update" class="nav-ajax-left"></span> -{{ endif }} -{{ if $nav.messages }} -<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a> -<span id="mail-update" class="nav-ajax-left"></span> -{{ endif }} - -{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }} - -{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }} -{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }} - - -</span> -<span id="nav-end"></span> -<span id="banner">$banner</span> -#} diff --git a/view/theme/quattro-green/nets.tpl b/view/theme/quattro-green/nets.tpl deleted file mode 100755 index cbadf1361..000000000 --- a/view/theme/quattro-green/nets.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<div id="nets-sidebar" class="widget"> - <h3>$title</h3> - <div id="nets-desc">$desc</div> - - <ul class="nets-ul"> - <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a> - {{ for $nets as $net }} - <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li> - {{ endfor }} - </ul> - -</div> diff --git a/view/theme/quattro-green/profile_vcard.tpl b/view/theme/quattro-green/profile_vcard.tpl deleted file mode 100755 index 7cd02f164..000000000 --- a/view/theme/quattro-green/profile_vcard.tpl +++ /dev/null @@ -1,63 +0,0 @@ -<div class="vcard"> - - <div class="tool"> - <div class="fn label">$profile.name</div> - {{ if $profile.edit }} - <div class="action"> - <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a> - <ul id="profiles-menu" class="menu-popup"> - {{ for $profile.menu.entries as $e }} - <li> - <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a> - </li> - {{ endfor }} - <li><a href="profile_photo" >$profile.menu.chg_photo</a></li> - <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li> - - </ul> - </div> - {{ endif }} - </div> - - - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> - - - - {{ if $location }} - <dl class="location"><dt class="location-label">$location</dt> - <dd class="adr"> - {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }} - <span class="city-state-zip"> - <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }} - <span class="region">$profile.region</span> - <span class="postal-code">$profile.postal-code</span> - </span> - {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }} - </dd> - </dl> - {{ endif }} - - {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }} - - {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }} - - {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }} - - {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - <div id="profile-extra-links"> - <ul> - {{ if $connect }} - <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li> - {{ endif }} - </ul> - </div> -</div> - -$contact_block - - diff --git a/view/theme/quattro-green/saved_searches_aside.tpl b/view/theme/quattro-green/saved_searches_aside.tpl deleted file mode 100755 index 9c10a26de..000000000 --- a/view/theme/quattro-green/saved_searches_aside.tpl +++ /dev/null @@ -1,15 +0,0 @@ -<div id="saved-search-list" class="widget"> - <h3 class="title">$title</h3> - - <ul id="saved-search-ul"> - {{ for $saved as $search }} - <li class="tool {{if $search.selected}}selected{{endif}}"> - <a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a> - <a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a> - </li> - {{ endfor }} - </ul> - - $searchbox - -</div> diff --git a/view/theme/quattro-green/search_item.tpl b/view/theme/quattro-green/search_item.tpl deleted file mode 100755 index 80d6678fb..000000000 --- a/view/theme/quattro-green/search_item.tpl +++ /dev/null @@ -1,91 +0,0 @@ - -<div class="wall-item-decor"> - <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span> - {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> -</div> - -<div class="wall-item-container $item.indent"> - <div class="wall-item-item"> - <div class="wall-item-info"> - <div class="contact-photo-wrapper" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> - </a> - <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> - <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id"> - $item.item_photo_menu - </ul> - - </div> - <div class="wall-item-location">$item.location</div> - </div> - <div class="wall-item-content"> - {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} - $item.body - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"> - </div> - <div class="wall-item-tags"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - </div> - <div class="wall-item-bottom"> - <div class=""> - {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} - </div> - <div class="wall-item-actions"> - <div class="wall-item-actions-author"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span> - </div> - - <div class="wall-item-actions-social"> - {{ if $item.star }} - <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a> - <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a> - {{ endif }} - - {{ if $item.vote }} - <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> - <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a> - {{ endif }} - - {{ if $item.vote.share }} - <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a> - {{ endif }} - </div> - - <div class="wall-item-actions-tools"> - - {{ if $item.drop.dropping }} - <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> - <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a> - {{ endif }} - {{ if $item.edpost }} - <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - </div> - - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"></div> - <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> - {{ if $item.conv }} - <div class="wall-item-conv" id="wall-item-conv-$item.id" > - <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a> - {{ endif }} - </div> - </div> - - -</div> - diff --git a/view/theme/quattro-green/theme.php b/view/theme/quattro-green/theme.php new file mode 100644 index 000000000..7a0a869f8 --- /dev/null +++ b/view/theme/quattro-green/theme.php @@ -0,0 +1,11 @@ +<?php +/* + * Name: quattro-green + * Version: 1.0 + * Author: Fabio Communi <fabrix.xm@gmail.com> + * Maintainer: Tobias Diekershoff + */ +$a->theme_info = array( + 'extends' => 'quattro', +); +EOT; diff --git a/view/theme/quattro-green/theme_settings.tpl b/view/theme/quattro-green/theme_settings.tpl deleted file mode 100644 index 25af04253..000000000 --- a/view/theme/quattro-green/theme_settings.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<div class="settings-block"> - <h3 class="settings-heading">$title</h3> - - {{inc field_select.tpl with $field=$align}}{{endinc}} - - <div class="settings-submit-wrapper"> - <input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" /> - </div> - - -</div> diff --git a/view/theme/quattro-green/wall_item.tpl b/view/theme/quattro-green/wall_item.tpl deleted file mode 100755 index e771db068..000000000 --- a/view/theme/quattro-green/wall_item.tpl +++ /dev/null @@ -1,90 +0,0 @@ - -<div class="wall-item-decor"> - <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span> - {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> -</div> - -<div class="wall-item-container $item.indent"> - <div class="wall-item-item"> - <div class="wall-item-info"> - <div class="contact-photo-wrapper" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> - </a> - <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> - <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> - $item.item_photo_menu - </ul> - - </div> - <div class="wall-item-location">$item.location</div> - </div> - <div class="wall-item-content"> - {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} - $item.body - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"> - </div> - <div class="wall-item-tags"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - </div> - <div class="wall-item-bottom"> - <div class=""> - {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} - </div> - <div class="wall-item-actions"> - <div class="wall-item-actions-author"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span> - </div> - - <div class="wall-item-actions-social"> - {{ if $item.star }} - <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a> - <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a> - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a> - {{ endif }} - - {{ if $item.vote }} - <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> - <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a> - {{ endif }} - - {{ if $item.vote.share }} - <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a> - {{ endif }} - </div> - - <div class="wall-item-actions-tools"> - - {{ if $item.drop.dropping }} - <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> - <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a> - {{ endif }} - {{ if $item.edpost }} - <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - </div> - - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"></div> - <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> - </div> -</div> - -<div class="wall-item-comment-wrapper" > - $item.comment -</div> diff --git a/view/theme/quattro-green/wallwall_item.tpl b/view/theme/quattro-green/wallwall_item.tpl deleted file mode 100755 index 693ebaba6..000000000 --- a/view/theme/quattro-green/wallwall_item.tpl +++ /dev/null @@ -1,96 +0,0 @@ -<div class="wall-item-decor"> - <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span> - {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> -</div> - -<div class="wall-item-container $item.indent"> - <div class="wall-item-item"> - <div class="wall-item-info"> - <div class="contact-photo-wrapper mframe wwfrom" - onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" - onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> - <img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> - </a> - <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a> - <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> - $item.item_photo_menu - </ul> - - </div> - <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" > - <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id"> - <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" /> - </a> - </div> - <div class="wall-item-location">$item.location</div> - </div> - <div class="wall-item-content"> - {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }} - $item.body - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"> - </div> - <div class="wall-item-tags"> - {{ for $item.tags as $tag }} - <span class='tag'>$tag</span> - {{ endfor }} - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"> - {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} - </div> - <div class="wall-item-actions"> - <div class="wall-item-actions-author"> - <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span> - <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall - - </div> - - <div class="wall-item-actions-social"> - {{ if $item.star }} - <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a> - <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a> - - {{ endif }} - {{ if $item.filer }} - <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a> - {{ endif }} - - {{ if $item.vote }} - <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> - <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a> - {{ endif }} - - {{ if $item.vote.share }} - <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a> - {{ endif }} - </div> - - <div class="wall-item-actions-tools"> - - {{ if $item.drop.dropping }} - <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" /> - <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a> - {{ endif }} - {{ if $item.edpost }} - <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a> - {{ endif }} - </div> - - </div> - </div> - <div class="wall-item-bottom"> - <div class="wall-item-links"></div> - <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> - </div> -</div> -<div class="wall-item-comment-wrapper" > - $item.comment -</div> |
